From 0d88f8472f72b097522da5c9326f4fa99f536a60 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Thu, 11 Aug 2022 12:23:25 -0700
Subject: [PATCH] Don't reload or enter repl when autoreloading

A keypress while we waited for autoreload used to enter repl. Now
it won't.

Fixes #6480
---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.c b/main.c
index 015c4b512c..c7232a1d18 100644
--- 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) {