Fixed nullref when entering game

linuxgurugamer · Dec 26, 2022 · fb2ac76 · fb2ac76
1 parent 811693e
commit fb2ac76
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 6 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,8 @@
 ChangeLog
 
+2.1.10.20
+	Fixed nullref when entering game
+
 2.1.10.19
 	Fixed issue where changing the FocusFollowsClick in the settings wasn't being saved properly
 	Fixed issue where changing the global setting in the settings wasn't being honored

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

diff --git a/ClickThroughBlocker/AssemblyVersion.cs b/ClickThroughBlocker/AssemblyVersion.cs
@@ -5,6 +5,6 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("2.1.10.18")]
- [assembly: AssemblyFileVersion("2.1.10.18")]
+ [assembly: AssemblyVersion("2.1.10.19")]
+ [assembly: AssemblyFileVersion("2.1.10.19")]
  [assembly: KSPAssembly("ClickThroughBlocker", 2, 1, 0)]
diff --git a/ClickThroughBlocker/OneTimePopup.cs b/ClickThroughBlocker/OneTimePopup.cs
@@ -151,7 +151,7 @@ static internal bool GetGlobalDefault(ref bool b)
         {
             if (System.IO.File.Exists(GlobalDefaultFile))
             {
-                if (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)
+                if (HighLogic.CurrentGame == null || HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)
                 {
                     ConfigNode node = ConfigNode.Load(GlobalDefaultFile);
                     if (node.TryGetValue("focusFollowsClick", ref b))

diff --git a/GameData/000_ClickThroughBlocker/ClickThroughBlocker.version b/GameData/000_ClickThroughBlocker/ClickThroughBlocker.version
@@ -10,7 +10,7 @@
     "MAJOR": 2,
     "MINOR": 1,
     "PATCH": 10,
-    "BUILD": 18
+    "BUILD": 19
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

diff --git a/GameData/000_ClickThroughBlocker/changelog.cfg b/GameData/000_ClickThroughBlocker/changelog.cfg
@@ -7,6 +7,17 @@ KERBALCHANGELOG
 
 
 
+	VERSION
+	{
+		version = 2.1.10.19
+		CHANGE
+		{
+ 			change = Fixed issue where changing the FocusFollowsClick in the settings wasn't being saved properly
+			change = Fixed issue where changing the global setting in the settings wasn't being honored
+
+			type = update
+		}
+	}
 	VERSION
 	{
 		version = 2.1.10.18

diff --git a/changelog.cfg b/changelog.cfg
@@ -5,6 +5,16 @@ KERBALCHANGELOG
 	license = Lesser GPLv3
 	author = Linuxgurugamer
 
+ 	VERSION
+	{
+		version = 2.1.10.20
+		CHANGE
+		{
+			change = Fixed nullref when entering game
+
+			type = update
+		}
+	}
 
 
 	VERSION

diff --git a/deploy.bat b/deploy.bat
@@ -9,7 +9,7 @@ rem    but not always
 
 set H=%KSPDIR%
 
-set H=R:\KSP_1.12.4
+rem set H=R:\KSP_1.12.4
 
 set GAMEDIR=000_ClickThroughBlocker
 set GAMEDATA=GameData