Merge pull request #6751 from tannewt/no_any_key_while_reloading

microdev1 · web-flow · commit 5c184faa955f · 2022-08-13T15:22:50.000+05:30
Don't reload or enter repl when autoreloading
diff --git a/main.c b/main.c
@@ -543,7 +543,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re
         }
 
         // If interrupted by keyboard, return
-        if (serial_connected() && serial_bytes_available()) {
+        if (serial_connected() && serial_bytes_available() && !autoreload_pending()) {
             // Skip REPL if reload was requested.
             skip_repl = serial_read() == CHAR_CTRL_D;
             if (skip_repl) {

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`// If interrupted by keyboard, return`
`546`		`- if (serial_connected() && serial_bytes_available()) {`
	`546`	`+ if (serial_connected() && serial_bytes_available() && !autoreload_pending()) {`
`547`	`547`	`// Skip REPL if reload was requested.`
`548`	`548`	`skip_repl = serial_read() == CHAR_CTRL_D;`
`549`	`549`	`if (skip_repl) {`