Fixed another nullref when entering game

linuxgurugamer · linuxgurugamer · commit 1fe3e90f7fa7 · 2023-01-12T08:23:45.000-05:00
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,8 @@
 ChangeLog
 
+2.1.20.21 (unreleased)
+	Fixed another nullref when starting game
+
 2.1.10.20
 	Fixed nullref when entering game
 
diff --git a/ClickThroughBlocker/AssemblyVersion.cs b/ClickThroughBlocker/AssemblyVersion.cs
@@ -5,6 +5,6 @@
   
  using System.Reflection;
 
- [assembly: AssemblyVersion("2.1.10.19")]
- [assembly: AssemblyFileVersion("2.1.10.19")]
+ [assembly: AssemblyVersion("2.1.10.21")]
+ [assembly: AssemblyFileVersion("2.1.10.21")]
  [assembly: KSPAssembly("ClickThroughBlocker", 2, 1, 0)]
diff --git a/ClickThroughBlocker/RegisterToolbar.cs b/ClickThroughBlocker/RegisterToolbar.cs
@@ -18,7 +18,7 @@ void Start()
         }
         void OnGameSettingsWritten()
         {
-            if (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)
+            if (HighLogic.CurrentGame != null && HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)
                 OneTimePopup.SaveGlobalDefault (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick);
         }
 
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": 19
+    "BUILD": 21
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
diff --git a/GameData/000_ClickThroughBlocker/changelog.cfg b/GameData/000_ClickThroughBlocker/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/changelog.cfg b/changelog.cfg
@@ -5,6 +5,16 @@ KERBALCHANGELOG
 	license = Lesser GPLv3
 	author = Linuxgurugamer
  
+ 	VERSION
+	{
+		version = 2.1.10.22
+		CHANGE
+		{
+			change = Fixed another nullref when entering game
+
+			type = update
+		}
+	}
  	VERSION
 	{
 		version = 2.1.10.20

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ void Start()`
`18`	`18`	`}`
`19`	`19`	`void OnGameSettingsWritten()`
`20`	`20`	`{`
`21`		`- if (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)`
	`21`	`+ if (HighLogic.CurrentGame != null && HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)`
`22`	`22`	`OneTimePopup.SaveGlobalDefault (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick);`
`23`	`23`	`}`
`24`	`24`