Skip to content

Commit 9f65696

Browse files
committed
Fix load screen appearing when doing 'load("filename")'
1 parent e779e5a commit 9f65696

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/jsinteractive.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2158,6 +2158,7 @@ void jsiIdle() {
21582158
}
21592159
if ((s&JSIS_TODO_FLASH_LOAD) == JSIS_TODO_FLASH_LOAD) {
21602160
JsVar *filenameVar = jsvObjectGetChild(execInfo.hiddenRoot,JSI_LOAD_CODE_NAME,0);
2161+
// TODO: why can't we follow the same steps here for both?
21612162
if (filenameVar) {
21622163
JsfFileName filename = jsfNameFromVarAndUnLock(filenameVar);
21632164
// no need to jsvObjectRemoveChild as we're shutting down anyway!

src/jsinteractive.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ typedef enum {
155155
JSIS_COMPLETELY_RESET = 1<<11, ///< Has the board powered on, having not loaded anything from flash
156156

157157
JSIS_ECHO_OFF_MASK = JSIS_ECHO_OFF|JSIS_ECHO_OFF_FOR_LINE,
158-
JSIS_SOFTINIT_MASK = JSIS_PASSWORD_PROTECTED|JSIS_WATCHDOG_AUTO // stuff that DOESN'T get reset on softinit
158+
JSIS_SOFTINIT_MASK = JSIS_PASSWORD_PROTECTED|JSIS_WATCHDOG_AUTO|JSIS_TODO_MASK // stuff that DOESN'T get reset on softinit
159159
// watchdog can't be reset without a reboot so if it's set to auto we must keep it as auto
160160
} PACKED_FLAGS JsiStatus;
161161

0 commit comments

Comments
 (0)