Merge pull request adafruit#849 from dhalbert/2.x_boot_output_file

tannewt · web-flow · commit ba028ae62341 · 2018-05-19T12:13:39.000-05:00
2.x: wasn't always clearing boot_output_file
diff --git a/atmel-samd/main.c b/atmel-samd/main.c
@@ -782,8 +782,8 @@ int main(void) {
         if (!skip_boot_output) {
             f_close(boot_output_file);
             flash_flush();
-            boot_output_file = NULL;
         }
+        boot_output_file = NULL;
         #endif
 
         // Reset to remove any state that boot.py setup. It should only be used to

Original file line number	Diff line number	Diff line change
`@@ -782,8 +782,8 @@ int main(void) {`
`782`	`782`	`if (!skip_boot_output) {`
`783`	`783`	`f_close(boot_output_file);`
`784`	`784`	`flash_flush();`
`785`		`- boot_output_file = NULL;`
`786`	`785`	`}`
	`786`	`+ boot_output_file = NULL;`
`787`	`787`	`#endif`
`788`	`788`
`789`	`789`	`// Reset to remove any state that boot.py setup. It should only be used to`