Fix nullrefs upong returning to mainmenu by adding check for no game loaded (ie: returning to main menu) in CBTMonitor.Update & CBTMonitor.LateUpdate

Author: linuxgurugamer

Changelog.txt

@@ -1,9 +1,13 @@
 ChangeLog
 
+0.1.10.10
+	Fix nullrefs upong returning to mainmenu by adding check for no game loaded (ie:  returning to main menu) in CBTMonitor.Update & CBTMonitor.LateUpdate
+
 0.1.10.9
 	Fixed Popupshown.cfg from having endless repeats of the popupshown = true appended
 	Fixed error which caused buildings to be non-clickable if clicking on a control in the window closed it (such as an X or a Close button)
 	Made all members of Log class to be internal, to avoid conflicts with KSP_Log
+	Modified the CBTMonitor to run in all scenes, needed for FocusToClick to work properly
 
 0.1.10.6
 	Added missing files

ClickThroughBlocker.version

@@ -10,7 +10,7 @@
     "MAJOR": 0,
     "MINOR": 1,
     "PATCH": 10,
-    "BUILD": 9
+    "BUILD": 10
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

ClickThroughBlocker/AssemblyVersion.cs

@@ -5,4 +5,4 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("0.1.10.9")]
+ [assembly: AssemblyVersion("0.1.10.10")]

ClickThroughBlocker/CBTMonitor.cs

@@ -25,7 +25,7 @@ void onGameSceneLoadRequested(GameScenes gs)
         // the mouse moved over a protected window
         void Update()
         {
-            if (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick)
+            if (HighLogic.CurrentGame == null || HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick)
                 return;
             {
                 if (ClickThruBlocker.CTBWin.activeBlockerCnt > 0)
@@ -66,7 +66,7 @@ void Update()
         int d;
         void LateUpdate()
         {
-            if (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick)
+            if (HighLogic.CurrentGame == null || HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick)
                 return;
 
             d = 0;

GameData/000_ClickThroughBlocker/ClickThroughBlocker.version

@@ -10,7 +10,7 @@
     "MAJOR": 0,
     "MINOR": 1,
     "PATCH": 10,
-    "BUILD": 9
+    "BUILD": 10
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

GameData/000_ClickThroughBlocker/changelog.cfg

@@ -7,14 +7,28 @@ KERBALCHANGELOG
 
 	VERSION
 	{
-		version = 0.1.10.8
+		version = 0.1.10.10
 		CHANGE
 		{
-			change = Fixed buildings being non-clickable after selecting FocusFollowsMouse
+			change = Fix nullrefs upong returning to mainmenu by adding check for no game loaded (ie:  returning to main menu) in CBTMonitor.Update & CBTMonitor.LateUpdate
 			type = update
 		}
 	}
 
+	VERSION
+	{
+		version = 0.1.10.9
+		CHANGE
+		{
+			change = Fixed lock issues
+			type = update
+			subchange = Fixed Popupshown.cfg from having endless repeats of the popupshown = true appended
+			subchange = Fixed error which caused buildings to be non-clickable if clicking on a control in the window closed it (such as an X or a Close button)
+			subchange = Made all members of Log class to be internal, to avoid conflicts with KSP_Log
+			subchange = 	Modified the CBTMonitor to run in all scenes, needed for FocusToClick to work properly
+		}
+	}
+
  	VERSION
 	{
 		version = 1.0.10.7

changelog.cfg

@@ -5,6 +5,16 @@ KERBALCHANGELOG
 	license = Lesser GPLv3
 	author = Linuxgurugamer
 
+	VERSION
+	{
+		version = 0.1.10.10
+		CHANGE
+		{
+			change = Fix nullrefs upong returning to mainmenu by adding check for no game loaded (ie:  returning to main menu) in CBTMonitor.Update & CBTMonitor.LateUpdate
+			type = update
+		}
+	}
+
 	VERSION
 	{
 		version = 0.1.10.9
@@ -15,6 +25,7 @@ KERBALCHANGELOG
 			subchange = Fixed Popupshown.cfg from having endless repeats of the popupshown = true appended
 			subchange = Fixed error which caused buildings to be non-clickable if clicking on a control in the window closed it (such as an X or a Close button)
 			subchange = Made all members of Log class to be internal, to avoid conflicts with KSP_Log
+			subchange = 	Modified the CBTMonitor to run in all scenes, needed for FocusToClick to work properly
 		}
 	}