rewrote the interface locking safety

redscientistlabs · Aug 6, 2024 · cd1d795 · cd1d795
1 parent e42b347
commit cd1d795
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/Source/Frontend/UI/UICore.cs b/Source/Frontend/UI/UICore.cs
@@ -188,18 +188,17 @@ public static void UpdateFormFocusStatus(bool? forceSet = null)
 
         public static void LockInterface(bool focusCoreForm = true, bool blockMainForm = false)
         {
-            if (interfaceLocked || lockPending)
-            {
-                return;
-            }
-
-            lockPending = true;
             lock (lockObject)
             {
+                if (interfaceLocked)
+                    return;
+
+                interfaceLocked = true;
+
                 //Kill hotkeys while locked
                 SetHotkeyTimer(false);
 
-                interfaceLocked = true;
+
                 var cf = S.GET<CoreForm>();
                 cf.LockSideBar();
 
@@ -224,21 +223,16 @@ public static void LockInterface(bool focusCoreForm = true, bool blockMainForm =
                     cf.Focus();
                 }
             }
-            lockPending = false;
         }
 
         public static void UnlockInterface()
         {
-            if (lockPending)
-            {
-                lockPending = false;
-            }
-
             lock (lockObject)
             {
-                interfaceLocked = false;
-                S.GET<CoreForm>().UnlockSideBar();
+                if (!interfaceLocked)
+                    return;
 
+                S.GET<CoreForm>().UnlockSideBar();
                 S.GET<ConnectionStatusForm>().pnBlockedButtons.Hide();
 
                 CanvasForm.mainForm.UnblockView();
@@ -251,6 +245,8 @@ public static void UnlockInterface()
 
                 //Resume hotkeys
                 SetHotkeyTimer(true);
+
+                interfaceLocked = false;
             }
         }
 
@@ -302,8 +298,7 @@ internal static void UnblockView(this IBlockable ib)
         }
 
         internal static volatile bool isClosing = false;
-        private static bool interfaceLocked;
-        private static bool lockPending;
+        public static volatile bool interfaceLocked = false;
         private static object lockObject = new object();
 
         internal static object InputLock = new object();