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

Backport to 7.3.x of 6751: Don't reload or enter repl when autoreloading
2022-08-25 07:36:45 -04:00 · 2022-08-25 07:36:45 -04:00 · 4276b06824
commit 4276b06824
parent 5a046a9f47 0d88f8472f
1 changed files with 1 additions and 1 deletions
--- 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) {