Repsect UI locking

ihsoft · Sep 21, 2016 · 359991c · 359991c
1 parent 6cc7450
commit 359991c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Source/CHANGES.md b/Source/CHANGES.md
@@ -0,0 +1,2 @@
+### 1.0.3 dev
+- [Enhacement] Don't act if UI or vessel switch input is locked.
diff --git a/Source/Controller.cs b/Source/Controller.cs
@@ -135,8 +135,11 @@ void OnGUI() {
   /// <summary>Overridden from MonoBehavior.</summary>
   /// <remarks>Tracks keys and mouse moveement.</remarks>
   void Update() {
-    // Cancel any selection if game is paused or time warped. Block UI as well. 
-    if (Mathf.Approximately(Time.timeScale, 0f) || Time.timeScale > 1f) {
+    // Cancel any selection if game is paused or time warped. Also check if vessel swicthing or UI
+    // in general are locked, this is a sign that some other plugin is being actively interacting
+    // with input. Cancel all EVS activities if it's the case.
+    if (Mathf.Approximately(Time.timeScale, 0f) || Time.timeScale > 1f
+        || InputLockManager.IsLocked(ControlTypes.UI | ControlTypes.VESSEL_SWITCHING)) {
       if (hoveredVessel != null) {
         SetHoveredVessel(null);
       }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		### 1.0.3 dev
		- [Enhacement] Don't act if UI or vessel switch input is locked.