Merge pull request #5602 from aivarannamaa/skip-main-script-in-raw-mode-soft-reboot

tannewt · web-flow · commit af2ac0aa6041 · 2021-11-23T10:32:48.000-08:00
Don't run main script when soft-rebooting in raw mode
diff --git a/main.c b/main.c
@@ -858,7 +858,11 @@ int __attribute__((used)) main(void) {
                 serial_write_compressed(translate("soft reboot\n"));
             }
             first_run = false;
-            skip_repl = run_code_py(safe_mode);
+            if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+                skip_repl = run_code_py(safe_mode);
+            } else {
+                skip_repl = false;
+            }
         } else if (exit_code != 0) {
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -858,7 +858,11 @@ int __attribute__((used)) main(void) {`
`858`	`858`	`serial_write_compressed(translate("soft reboot\n"));`
`859`	`859`	`}`
`860`	`860`	`first_run = false;`
`861`		`- skip_repl = run_code_py(safe_mode);`
	`861`	`+ if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {`
	`862`	`+ skip_repl = run_code_py(safe_mode);`
	`863`	`+ } else {`
	`864`	`+ skip_repl = false;`
	`865`	`+ }`
`862`	`866`	`} else if (exit_code != 0) {`
`863`	`867`	`break;`
`864`	`868`	`}`