Fixed issue on 1.11 where a uncontrolled ship would be controllable w…

…hen changing scenes to it
linuxgurugamer · Jun 16, 2021 · 8333fed · 8333fed
1 parent 779b2d9
commit 8333fed
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 10 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,8 @@
 ChangeLog
 
+0.1.10.16
+	Fixed issue on 1.11 where a uncontrolled ship would be controllable when changing scenes to it
+
 0.1.10.15
 	Fixed issue in editor where a single open window which was closed was leaving everything locked.
 

diff --git a/ClickThroughBlocker.version b/ClickThroughBlocker.version
@@ -10,11 +10,11 @@
     "MAJOR": 0,
     "MINOR": 1,
     "PATCH": 10,
-    "BUILD": 15
+    "BUILD": 16
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 11,
     "PATCH": 0
   }
 }
diff --git a/ClickThroughBlocker/AssemblyVersion.cs b/ClickThroughBlocker/AssemblyVersion.cs
@@ -5,4 +5,4 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("0.1.10.14")]
+ [assembly: AssemblyVersion("0.1.10.16")]
diff --git a/ClickThroughBlocker/SceneChangeCleanup.cs b/ClickThroughBlocker/SceneChangeCleanup.cs
@@ -6,7 +6,7 @@
 namespace ClearAllInputLocks
 {
     [KSPAddon(KSPAddon.Startup.AllGameScenes, false)]
-        class SceneChangeCleanup : MonoBehaviour
+    class SceneChangeCleanup : MonoBehaviour
     {
         void Start()
         {
@@ -60,13 +60,16 @@ void StopStartCoroutine()
         }
 
         bool isRunning = false;
-        IEnumerator  CleanupInputLocks()
+        IEnumerator CleanupInputLocks()
         {
             //Log.Info("CleanUpInputLocks entry");
             isRunning = true;
             yield return new WaitForSeconds(HighLogic.CurrentGame.Parameters.CustomParams<ClickThroughFix.CTB>().cleanupDelay);
-            InputLockManager.ClearControlLocks();
-            yield return null;
+            if (Versioning.version_major == 1 && Versioning.version_minor < 11)
+            {
+                InputLockManager.ClearControlLocks();
+                yield return null;
+            }
             isRunning = false;
             //Log.Info("CleanUpInputLocks exit");
         }

diff --git a/ClickThroughBlocker/Settings.cs b/ClickThroughBlocker/Settings.cs
@@ -44,7 +44,14 @@ public class CTB : GameParameters.CustomParameterNode
             toolTip = "Time to wait after scene change before clearing all the input locks")]
         public float cleanupDelay = 0.5f;
 
-        public override bool Enabled(MemberInfo member, GameParameters parameters) { return true; }
+        public override bool Enabled(MemberInfo member, GameParameters parameters) 
+        {
+            if (Versioning.version_major == 1 && Versioning.version_minor >= 11)
+            {
+                return member.Name != "cleanupDelay";
+            }
+                return true; 
+        }
 
         bool? oldFocusFollowsClick;
 

diff --git a/GameData/000_ClickThroughBlocker/ClickThroughBlocker.version b/GameData/000_ClickThroughBlocker/ClickThroughBlocker.version
@@ -10,11 +10,11 @@
     "MAJOR": 0,
     "MINOR": 1,
     "PATCH": 10,
-    "BUILD": 14
+    "BUILD": 16
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
-    "MINOR": 8,
+    "MINOR": 11,
     "PATCH": 0
   }
 }
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 = 0.1.10.16
+		CHANGE
+		{
+			change = Fixed issue on 1.11 where a uncontrolled ship would be controllable when changing scenes to it
+			type = update
+		}
+	}
 	VERSION
 	{
 		version = 0.1.10.15

diff --git a/changelog.cfg b/changelog.cfg
@@ -5,6 +5,16 @@ KERBALCHANGELOG
 	license = Lesser GPLv3
 	author = Linuxgurugamer
 
+
+	VERSION
+	{
+		version = 0.1.10.16
+		CHANGE
+		{
+			change = Fixed issue on 1.11 where a uncontrolled ship would be controllable when changing scenes to it
+			type = update
+		}
+	}
 	VERSION
 	{
 		version = 0.1.10.15
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,4 @@

		using System.Reflection;

		[assembly: AssemblyVersion("0.1.10.14")]
		[assembly: AssemblyVersion("0.1.10.16")]