Merge branch 'master' into master

1 files changed, 2 insertions, 4 deletions

diff --git a/main.c b/main.c
index a6c7c0581..805888ddd 100755
--- a/main.c
+++ b/main.c
@@ -204,7 +204,7 @@ void cleanup_after_vm(supervisor_allocation* heap) {
 
 bool run_code_py(safe_mode_t safe_mode) {
     bool serial_connected_at_start = serial_connected();
-    #ifdef CIRCUITPY_AUTORELOAD_DELAY_MS
+    #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
     if (serial_connected_at_start) {
         serial_write("\n");
         if (autoreload_is_enabled()) {
@@ -264,9 +264,7 @@ bool run_code_py(safe_mode_t safe_mode) {
     rgb_status_animation_t animation;
     prep_rgb_status_animation(&result, found_main, safe_mode, &animation);
     while (true) {
-        #ifdef MICROPY_VM_HOOK_LOOP
-            MICROPY_VM_HOOK_LOOP
-        #endif
+        RUN_BACKGROUND_TASKS;
         if (reload_requested) {
             reload_requested = false;
             return true;