Merge pull request #6168 from dhalbert/ReloadException-in-repl

dhalbert · web-flow · commit 66fa923699e5 · 2022-03-16T14:33:52.000-04:00
fix ReloadException when in REPL
diff --git a/supervisor/shared/reload.c b/supervisor/shared/reload.c
@@ -80,7 +80,7 @@ inline bool autoreload_is_enabled() {
 }
 
 void autoreload_trigger() {
-    if (autoreload_enabled) {
+    if (autoreload_enabled & !autoreload_suspended) {
         last_autoreload_trigger = supervisor_ticks_ms32();
         // Guard against the rare time that ticks is 0;
         if (last_autoreload_trigger == 0) {
diff --git a/supervisor/shared/usb/usb_msc_flash.c b/supervisor/shared/usb/usb_msc_flash.c
@@ -216,8 +216,8 @@ void tud_msc_write10_complete_cb(uint8_t lun) {
     (void)lun;
 
     // This write is complete; initiate an autoreload.
-    autoreload_trigger();
     autoreload_resume(AUTORELOAD_SUSPEND_USB);
+    autoreload_trigger();
 }
 
 // Invoked when received SCSI_CMD_INQUIRY

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ inline bool autoreload_is_enabled() {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`void autoreload_trigger() {`
`83`		`- if (autoreload_enabled) {`
	`83`	`+ if (autoreload_enabled & !autoreload_suspended) {`
`84`	`84`	`last_autoreload_trigger = supervisor_ticks_ms32();`
`85`	`85`	`// Guard against the rare time that ticks is 0;`
`86`	`86`	`if (last_autoreload_trigger == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,8 @@ void tud_msc_write10_complete_cb(uint8_t lun) {`
`216`	`216`	`(void)lun;`
`217`	`217`
`218`	`218`	`// This write is complete; initiate an autoreload.`
`219`		`- autoreload_trigger();`
`220`	`219`	`autoreload_resume(AUTORELOAD_SUSPEND_USB);`
	`220`	`+ autoreload_trigger();`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`// Invoked when received SCSI_CMD_INQUIRY`