Fixed issue where changing the FocusFollowsClick in the settings was…

…n't being saved properly

 Fixed issue where changing the global setting in the settings wasn't being honored

Changelog.txt

@@ -1,5 +1,9 @@
 ChangeLog
 
+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
+
 2.1.10.18 
 	Fixed a memory leak where two game events were beiing  used, added a DontDestroyOnLoad to RegisterToolbar
 	Updated version number to avoid dependency issues

ClickThroughBlocker.version

@@ -10,7 +10,7 @@
     "MAJOR": 2,
     "MINOR": 1,
     "PATCH": 10,
-    "BUILD": 18
+    "BUILD": 19
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

ClickThroughBlocker/AssemblyVersion.cs

@@ -5,5 +5,6 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("1.1.10.17")]
- [assembly: AssemblyFileVersion("1.1.10.17")]
+ [assembly: AssemblyVersion("2.1.10.18")]
+ [assembly: AssemblyFileVersion("2.1.10.18")]
+ [assembly: KSPAssembly("ClickThroughBlocker", 2, 1, 0)]

ClickThroughBlocker/AssemblyVersion.tt

@@ -99,3 +99,4 @@
 
  [assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
  [assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")]
+ [assembly: KSPAssembly("ClickThroughBlocker", <#= major #>, <#= minor #>, 0)]

ClickThroughBlocker/ClickThroughBlocker.csproj

@@ -74,19 +74,21 @@
       <LastGenOutput>AssemblyVersion.cs</LastGenOutput>
     </Content>
   </ItemGroup>
-
   <ItemGroup>
     <Reference Include="$(KSPDIR)\KSP_x64_Data\Managed\Assembly*.dll">
       <Private>False</Private>
     </Reference>
     <Reference Include="$(KSPDIR)\KSP_x64_Data\Managed\UnityEngine*.dll">
       <Private>False</Private>
     </Reference>
-	   <Reference Include="System" />
+    <Reference Include="System" />
     <Reference Include="ToolbarControl">
       <HintPath>$(KSPDIR)\GameData\001_ToolbarControl\Plugins\ToolbarControl.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
@@ -116,4 +118,4 @@ if $(ConfigurationName) == Release (
     <PreBuildEvent>
 "$(DevEnvDir)\texttransform.exe" "$(ProjectDir)AssemblyVersion.tt"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

ClickThroughBlocker/OneTimePopup.cs

@@ -108,7 +108,7 @@ void PopUpWindow(int id)
             GUILayout.BeginHorizontal();
             if (GUILayout.Button("Save as global default for all new saves"))
             {
-                SaveGlobalDefault();
+                SaveGlobalDefault(focusFollowsClick);
             }
             if (GUILayout.Button("Accept"))
             {
@@ -140,21 +140,27 @@ static string GlobalDefaultFile
                 return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "/../Global.cfg";
             }
         }
-        void SaveGlobalDefault()
+        static internal void SaveGlobalDefault(bool focusFollowsClick)
         {
             ConfigNode node = new ConfigNode();
             node.AddValue("focusFollowsClick", focusFollowsClick);
             node.Save(GlobalDefaultFile);
         }
+
         static internal bool GetGlobalDefault(ref bool b)
         {
             if (System.IO.File.Exists(GlobalDefaultFile))
             {
-                ConfigNode node = ConfigNode.Load(GlobalDefaultFile);
-                if (node.TryGetValue("focusFollowsClick", ref b))
+                if (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)
                 {
-                    return true;
+                    ConfigNode node = ConfigNode.Load(GlobalDefaultFile);
+                    if (node.TryGetValue("focusFollowsClick", ref b))
+                    {
+                        return true;
+                    }
                 }
+                else
+                    return HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick;
             }
             return false;
         }

ClickThroughBlocker/Properties/AssemblyInfo.cs

@@ -34,6 +34,6 @@
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
-//[assembly: KSPAssembly("ClickThroughBlocker",1, 8, 0)]
 //[assembly: AssemblyVersion("0.1.7.0")]
+//[assembly: KSPAssembly("ClickThroughBlocker", 1, 8, 0)]
 

ClickThroughBlocker/RegisterToolbar.cs

@@ -13,12 +13,18 @@ void Start()
             ToolbarControl.RegisterMod(ClearInputLocks.MODID2, ClearInputLocks.MODNAME2);
             GameEvents.onGameNewStart.Add(OnGameNewStart);
             GameEvents.onGameStateCreated.Add(OnGameStateCreated);
+            GameEvents.OnGameSettingsWritten.Add(OnGameSettingsWritten);
             DontDestroyOnLoad(this);
         }
+        void OnGameSettingsWritten()
+        {
+            if (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().global)
+                OneTimePopup.SaveGlobalDefault (HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick);
+        }
 
         void OnGameNewStart()
         {
-            bool b = false ;
+            bool b = false;
             if (OneTimePopup.GetGlobalDefault(ref b))
             {
                 HighLogic.CurrentGame.Parameters.CustomParams<CTB>().focusFollowsclick = b;

GameData/000_ClickThroughBlocker/ClickThroughBlocker.version

@@ -7,10 +7,10 @@
     "REPOSITORY": "ClickThroughBlocker"
   },
   "VERSION": {
-    "MAJOR": 1,
+    "MAJOR": 2,
     "MINOR": 1,
     "PATCH": 10,
-    "BUILD": 17
+    "BUILD": 18
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

GameData/000_ClickThroughBlocker/changelog.cfg

@@ -6,13 +6,23 @@ KERBALCHANGELOG
 	author = Linuxgurugamer
 
 
-
+
+	VERSION
+	{
+		version = 2.1.10.18
+		CHANGE
+		{
+ 			change = Fixed a memory leak where two game events were being  used, added a DontDestroyOnLoad to RegisterToolbar
+			change = Updated version number to avoid dependency issues
+			type = update
+		}
+	}
 	VERSION
 	{
 		version = 0.1.10.17
 		CHANGE
 		{
- 			change - Added AssemblyFileVersion, needed for new KSP 1.12 dll verification
+ 			change = Added AssemblyFileVersion, needed for new KSP 1.12 dll verification
 			change = Added InstallChecker to ensure installation into correct directory
 			type = update
 		}

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

deploy.bat

@@ -9,6 +9,8 @@ rem    but not always
 
 set H=%KSPDIR%
 
+set H=R:\KSP_1.12.4
+
 set GAMEDIR=000_ClickThroughBlocker
 set GAMEDATA=GameData
 set VERSIONFILE=ClickThroughBlocker.version