Merge pull request #581 from retiutut/development

Dev 4.1.5-beta.2

Author: retiutut

CHANGELOG.md

@@ -1,6 +1,11 @@
 # v4.1.5
 Use OpenBCIHub v2.0.9 please.
 
+## Beta 2
+
+### Bug fixes
+* Only delete settings files if they are old/broken
+
 ## Beta 1
 
 ### Bug fixes

OpenBCI_GUI/Info.plist.tmpl

@@ -23,7 +23,7 @@
         <key>CFBundleShortVersionString</key>
         <string>4</string>
         <key>CFBundleVersion</key>
-        <string>4.1.5-beta.1</string>
+        <string>4.1.5-beta.2</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>NSHumanReadableCopyright</key>

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -56,7 +56,7 @@ import com.sun.jna.Pointer;
 //                       Global Variables & Instances
 //------------------------------------------------------------------------
 //Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
-String localGUIVersionString = "v4.1.5-beta.1";
+String localGUIVersionString = "v4.1.5-beta.2";
 String localGUIVersionDate = "August 2019";
 String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";
 Boolean guiVersionCheckHasOccured = false;

OpenBCI_GUI/SoftwareSettings.pde

@@ -383,8 +383,12 @@ class SoftwareSettings {
             println("InitSettings: " + settingsFileToLoad + " not found or other error.");
             errorUserSettingsNotFound = true;
             File f = new File(settingsFileToLoad);
-            if (f.exists()) {
-                if (f.delete()) println("SoftwareSettings: Removed old/broken settings file.");
+            //Only delete the settings file for other errors
+            //Leave file if it's just a channelNumber error or DataSource mismatch
+            if (!chanNumError && !dataSourceError) {
+                if (f.exists()) {
+                    if (f.delete()) println("SoftwareSettings: Removed old/broken settings file.");
+                }
             }
         }
     }
@@ -1564,7 +1568,8 @@ class SoftwareSettings {
             err = settingsFileToLoad + " not found.";
         }
 
-        if (err != null) {
+        //Only try to delete file for SettingsNotFound/Broken settings
+        if (err != null && (!chanNumError && !dataSourceError)) {
             println("Load Settings Error: " + err);
             File f = new File(settingsFileToLoad);
             if (f.exists()) {