From 582e934b808054a9a27edf4a6cab873af2ceab67 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Thu, 28 Mar 2024 19:13:24 +0100
Subject: [PATCH] Fix gamepad start button not unpausing

---
 P3D/Core/Core.vb                    | 4 ++--
 P3D/Screens/MainMenu/PauseScreen.vb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/P3D/Core/Core.vb b/P3D/Core/Core.vb
index 9e518d379..eabbe68c3 100644
--- a/P3D/Core/Core.vb
+++ b/P3D/Core/Core.vb
@@ -158,14 +158,14 @@
             ControllerHandler.Update()
             Controls.MakeMouseVisible()
             MouseHandler.Update()
-            If KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True Or ControllerHandler.ButtonDown(Buttons.Start) = True Then
+            If KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True OrElse ControllerHandler.ButtonPressed(Buttons.Start) = True Then
                 CurrentScreen.EscapePressed()
             End If
         End If
 
         CurrentScreen.Update()
         If CurrentScreen.CanChat = True Then
-            If KeyBoardHandler.KeyPressed(KeyBindings.ChatKey) = True Or ControllerHandler.ButtonPressed(Buttons.RightShoulder) = True Then
+            If KeyBoardHandler.KeyPressed(KeyBindings.ChatKey) = True OrElse ControllerHandler.ButtonPressed(Buttons.RightShoulder) = True Then
                 If JoinServerScreen.Online = True Or Player.SandBoxMode = True Or GameController.IS_DEBUG_ACTIVE = True Then
                     SetScreen(New ChatScreen(CurrentScreen))
                 End If
diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb
index cf43c13f8..573b1750a 100644
--- a/P3D/Screens/MainMenu/PauseScreen.vb
+++ b/P3D/Screens/MainMenu/PauseScreen.vb
@@ -170,12 +170,12 @@
             End Select
         End If
 
-        If Controls.Dismiss() = True Or KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True And leftEscapeKey = True Or ControllerHandler.ButtonPressed(Buttons.Start) = True Then
+        If Controls.Dismiss() = True OrElse leftEscapeKey = True AndAlso (KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True OrElse ControllerHandler.ButtonPressed(Buttons.Start) = True) Then
             SoundManager.PlaySound("select")
             ClickContinue()
         End If
 
-        If KeyBoardHandler.KeyDown(KeyBindings.EscapeKey) = False And ControllerHandler.ButtonDown(Buttons.Start) = False Then
+        If KeyBoardHandler.KeyDown(KeyBindings.EscapeKey) = False And ControllerHandler.ButtonPressed(Buttons.Start) = False Then
             Me.leftEscapeKey = True
         End If
     End Sub