Merge branch 'v1.5.4'

KSP-RO · Apr 9, 2016 · 0be5364 · 0be5364
2 parents df8e324 + ef4f12d
commit 0be5364
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/TestFlightCore/TestFlightCore/TestFlight.cs b/TestFlightCore/TestFlightCore/TestFlight.cs
@@ -764,23 +764,22 @@ public override void OnAwake()
             // v1.5.4 moved settings to PluginData but to avoid screwing over existing installs we want to migrate existing settings
             string pdSettingsFile = System.IO.Path.Combine(_AssemblyFolder, "PluginData/settings.cfg");
             string settingsFile = System.IO.Path.Combine(_AssemblyFolder, "../settings.cfg");
+            string pdDir = System.IO.Path.Combine(_AssemblyFolder, "PluginData");
             if (!System.IO.File.Exists(pdSettingsFile) && System.IO.File.Exists(settingsFile))
             {
                 userSettings = new UserSettings("../settings.cfg");
                 userSettings.Load();
-                string pdDir = System.IO.Path.Combine(_AssemblyFolder, "PluginData");
                 System.IO.Directory.CreateDirectory(pdDir);
                 userSettings.Save(pdSettingsFile);
                 System.IO.File.Delete(settingsFile);
             }
+            if (!System.IO.Directory.Exists(pdDir))
+            {
+                System.IO.Directory.CreateDirectory(pdDir);
+            }
 
             if (userSettings == null)
                 userSettings = new UserSettings("PluginData/settings.cfg");
-            if (userSettings.FileExists)
-            {
-                userSettings.Load();
-
-            }
 
             if (userSettings.FileExists)
                 userSettings.Load();