Merge pull request #6806 from dhalbert/7.3.x-6751-backport

dhalbert · web-flow · commit 4276b0682463 · 2022-08-25T07:36:45.000-04:00
Backport to 7.3.x of 6751: Don't reload or enter repl when autoreloading
diff --git a/main.c b/main.c
@@ -508,7 +508,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
`@@ -508,7 +508,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode, bool first_run, bool *simulate_re`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`// If interrupted by keyboard, return`
`511`		`- if (serial_connected() && serial_bytes_available()) {`
	`511`	`+ if (serial_connected() && serial_bytes_available() && !autoreload_pending()) {`
`512`	`512`	`// Skip REPL if reload was requested.`
`513`	`513`	`skip_repl = serial_read() == CHAR_CTRL_D;`
`514`	`514`	`if (skip_repl) {`