Merge branch 'master' of github.com:adafruit/circuitpython

deshipu · deshipu · commit d81db3bced68 · 2019-03-19T09:20:05.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -97,4 +97,4 @@
 	url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git
 [submodule "frozen/circuitpython-stage"]
 	path = frozen/circuitpython-stage
-	url = https://github.com/python-ugame/circuitpython-stage
+	url = https://github.com/python-ugame/circuitpython-stage.git
diff --git 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();
@@ -375,6 +376,7 @@ int run_repl(void) {
     } else {
         exit_code = pyexec_friendly_repl();
     }
+    filesystem_flush();
     reset_port();
     reset_board();
     stop_mp();
diff --git 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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,8 @@ void displayio_refresh_displays(void) {`
`29`	`29`	`if (mp_hal_is_interrupted()) {`
`30`	`30`	`return;`
`31`	`31`	`}`
`32`		`- // Somehow reloads from the sdcard are being lost. So, cheat and reraise.`
`33`		`- // But don't re-raise if already pending.`
`34`		`- if (reload_requested && MP_STATE_VM(mp_pending_exception) == MP_OBJ_NULL) {`
`35`		`- mp_raise_reload_exception();`
	`32`	`+ if (reload_requested) {`
	`33`	`+ // Reload is about to happen, so don't redisplay.`
`36`	`34`	`return;`
`37`	`35`	`}`
`38`	`36`