From 43915133a1e7c682cdae313273060379f1f029b2 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Sat, 16 Mar 2019 16:49:32 -0400
Subject: [PATCH 1/2] after code.py runs, flush filesystem before resetting
 heap

---
 main.c                             | 3 ++-
 shared-module/displayio/__init__.c | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index 4b58b778d2232..9b0da5f549014 100755
--- a/main.c
+++ b/main.c
@@ -213,10 +213,11 @@ bool run_code_py(safe_mode_t safe_mode) {
                 serial_write_compressed(translate("WARNING: Your code filename has two extensions\n"));
             }
         }
-        // Turn off the display before the heap disappears.
+        // Turn off the display and flush the fileystem before the heap disappears.
         #if CIRCUITPY_DISPLAYIO
         reset_displays();
         #endif
+        filesystem_flush();
         stop_mp();
         free_memory(heap);
         supervisor_move_memory();
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 546a46b1eb8df..ced5b0fef6645 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -29,10 +29,8 @@ void displayio_refresh_displays(void) {
     if (mp_hal_is_interrupted()) {
         return;
     }
-    // Somehow reloads from the sdcard are being lost. So, cheat and reraise.
-    // But don't re-raise if already pending.
-    if (reload_requested && MP_STATE_VM(mp_pending_exception) == MP_OBJ_NULL) {
-        mp_raise_reload_exception();
+    if (reload_requested) {
+        // Reload is about to happen, so don't redisplay.
         return;
     }
 

From a10e4fe21efd45596b82b50ffde98e8ec7e893c6 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Sat, 16 Mar 2019 17:44:25 -0400
Subject: [PATCH 2/2] also flush fileystem on soft reboot from repl

---
 main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.c b/main.c
index 9b0da5f549014..77498d7dee7a8 100755
--- a/main.c
+++ b/main.c
@@ -376,6 +376,7 @@ int run_repl(void) {
     } else {
         exit_code = pyexec_friendly_repl();
     }
+    filesystem_flush();
     reset_port();
     reset_board();
     stop_mp();