fix overlay trigger

Valkirie · May 2, 2022 · e72e33b · e72e33b
1 parent d2a19ee
commit e72e33b
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/HandheldCompanion/Views/Windows/Overlay.xaml.cs b/HandheldCompanion/Views/Windows/Overlay.xaml.cs
@@ -308,22 +308,26 @@ private void UpdateReport(object? sender, EventArgs e)
             }
 
             // Handle triggers
-            if ((Gamepad.Buttons & mainTrigger) != 0)
+            if (Gamepad.Buttons.HasFlag(mainTrigger))
             {
-                if (!isTriggered)
+                if (Gamepad.Buttons.HasFlag(controllerTrigger) && !isTriggered)
                 {
+                    UpdateControllerVisibility();
+                    UpdateVisibility();
                     isTriggered = true;
-
-                    if (Gamepad.Buttons.HasFlag(controllerTrigger))
-                        UpdateControllerVisibility();
-                    if (Gamepad.Buttons.HasFlag(trackpadTrigger))
-                        UpdateTrackpadsVisibility();
-
+                }
+
+                if (Gamepad.Buttons.HasFlag(trackpadTrigger) && !isTriggered)
+                {
+                    UpdateTrackpadsVisibility();
                     UpdateVisibility();
+                    isTriggered = true;
                 }
             }
             else if (isTriggered)
+            {
                 isTriggered = false;
+            }
 
             // handle triggers update
             if (ControllerTriggerListening && Gamepad.Buttons != 0)