Changed fix to properly add a default key in the ProfileManager

linuxgurugamer · Jun 26, 2021 · 76f934f · 76f934f
1 parent d3c99d3
commit 76f934f
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 6 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,8 @@
 ChangeLog
 
+1.9.9.2
+	Changed fix to properly add a default key in the ProfileManager
+
 1.9.9.1
 	Thanks to github user @kfsone for pointing out this error:
 		added missing ! in ScienceAlertProfileManager.cs to void a null ref exception

diff --git a/GameData/ScienceAlert/Plugins/ScienceAlert.pdb b/GameData/ScienceAlert/Plugins/ScienceAlert.pdb
diff --git a/GameData/ScienceAlert/ScienceAlert.version b/GameData/ScienceAlert/ScienceAlert.version
@@ -10,7 +10,7 @@
     "MAJOR": 1,
     "MINOR": 9,
     "PATCH": 9,
-    "BUILD": 1
+    "BUILD": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

diff --git a/ScienceAlert.version b/ScienceAlert.version
@@ -10,7 +10,7 @@
     "MAJOR": 1,
     "MINOR": 9,
     "PATCH": 9,
-    "BUILD": 1
+    "BUILD": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

diff --git a/Source/AssemblyVersion.cs b/Source/AssemblyVersion.cs
@@ -9,4 +9,4 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("1.9.9.1")]
+ [assembly: AssemblyVersion("1.9.9.2")]
diff --git a/Source/Properties/Settings.Designer.cs b/Source/Properties/Settings.Designer.cs
diff --git a/Source/Properties/Settings.settings b/Source/Properties/Settings.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/Source/ScienceAlert.ProfileData/ScienceAlertProfileManager.cs b/Source/ScienceAlert.ProfileData/ScienceAlertProfileManager.cs
@@ -332,8 +332,11 @@ public static Profile DefaultProfile
             get
             {
                 var key = Instance.storedProfiles.Keys.SingleOrDefault(k => k.ToLower().Equals("default"));
-                if (!string.IsNullOrEmpty(key))
+                if (string.IsNullOrEmpty(key))
+                {
+                    key = "default";
                     Instance.storedProfiles.Add(key, Profile.MakeDefault());
+                }
                 return Instance.storedProfiles[key];
             }
         }

diff --git a/Source/ScienceAlert.csproj b/Source/ScienceAlert.csproj
@@ -29,6 +29,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <DebugType>portable</DebugType>
@@ -135,4 +136,4 @@ if $(ConfigurationName) == Release (
   <PropertyGroup>
     <PreBuildEvent>"$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/deploy.bat b/deploy.bat
@@ -8,14 +8,20 @@ rem VERSIONFILE is the name of the version file, usually the same as GAMEDATA,
 rem    but not always
 
 set H=%KSPDIR%
+rem set H=R:\KSP_1.12.0
 
 set GAMEDIR=ScienceAlert
 set GAMEDATA="GameData"
 set VERSIONFILE=%GAMEDIR%.version
 
+set DP0=r:\dp0\kspdev
+
 copy /Y "%1%2" "%GAMEDATA%\%GAMEDIR%\Plugins"
+copy /Y "%1%3".pdb "%GAMEDATA%\%GAMEDIR%\Plugins"
+
 copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR%
 
 xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%H%\GameData\%GAMEDIR%"
+xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%DP0%\GameData\%GAMEDIR%"
 
-rem pause
+rem pause