Merge pull request adafruit#848 from dhalbert/3.0-boot_output_file

tannewt · web-flow · commit ebeb32307d3c · 2018-05-19T12:13:10.000-05:00
3.0: wasn't always clearing boot_output_file
diff --git a/main.c b/main.c
@@ -329,8 +329,8 @@ int __attribute__((used)) main(void) {
         if (!skip_boot_output) {
             f_close(boot_output_file);
             filesystem_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
`@@ -329,8 +329,8 @@ int __attribute__((used)) main(void) {`
`329`	`329`	`if (!skip_boot_output) {`
`330`	`330`	`f_close(boot_output_file);`
`331`	`331`	`filesystem_flush();`
`332`		`- boot_output_file = NULL;`
`333`	`332`	`}`
	`333`	`+ boot_output_file = NULL;`
`334`	`334`	`#endif`
`335`	`335`
`336`	`336`	`// Reset to remove any state that boot.py setup. It should only be used to`