From 1e8129d08a950b7b3ecfbe63297c97f0174a7107 Mon Sep 17 00:00:00 2001
From: kemo <kareemolim@gmail.com>
Date: Sat, 26 Jun 2021 03:37:06 +0200
Subject: [PATCH] pause menu fix

fixed pause menu not accepting input from keyboard if controller is connected
---
 source/PauseSubState.hx | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx
index 8d0c323..f2e3a0b 100644
--- a/source/PauseSubState.hx
+++ b/source/PauseSubState.hx
@@ -111,19 +111,18 @@ class PauseSubState extends MusicBeatSubstate
 
 		var gamepad:FlxGamepad = FlxG.gamepads.lastActive;
 
-		var upP = controls.UP_P;
-		var downP = controls.DOWN_P;
-		var leftP = controls.LEFT_P;
-		var rightP = controls.RIGHT_P;
-		var accepted = controls.ACCEPT;
+		var upPcontroller:Bool = false;
+		var downPcontroller:Bool = false;
+		var leftPcontroller:Bool = false;
+		var rightPcontroller:Bool = false;
 		var oldOffset:Float = 0;
 
 		if (gamepad != null && KeyBinds.gamepad)
 		{
-			upP = gamepad.justPressed.DPAD_UP;
-			downP = gamepad.justPressed.DPAD_DOWN;
-			leftP = gamepad.justPressed.DPAD_LEFT;
-			rightP = gamepad.justPressed.DPAD_RIGHT;
+			upPcontroller = gamepad.justPressed.DPAD_UP;
+			downPcontroller = gamepad.justPressed.DPAD_DOWN;
+			leftPcontroller = gamepad.justPressed.DPAD_LEFT;
+			rightPcontroller = gamepad.justPressed.DPAD_RIGHT;
 		}
 
 		// pre lowercasing the song name (update)
@@ -134,17 +133,18 @@ class PauseSubState extends MusicBeatSubstate
 		}
 		var songPath = 'assets/data/' + songLowercase + '/';
 
-		if (upP)
+		if (controls.UP_P || upPcontroller)
 		{
 			changeSelection(-1);
    
-		}else if (downP)
+		}
+		else if (controls.DOWN_P || downPcontroller)
 		{
 			changeSelection(1);
 		}
 		
 		#if cpp
-			else if (leftP)
+			else if (controls.LEFT_P || leftPcontroller)
 			{
 				oldOffset = PlayState.songOffset;
 				PlayState.songOffset -= 1;
@@ -171,7 +171,8 @@ class PauseSubState extends MusicBeatSubstate
 					cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
 					offsetChanged = true;
 				}
-			}else if (rightP)
+			} 
+			else if (controls.RIGHT_P || rightPcontroller)
 			{
 				oldOffset = PlayState.songOffset;
 				PlayState.songOffset += 1;
@@ -199,7 +200,7 @@ class PauseSubState extends MusicBeatSubstate
 			}
 		#end
 
-		if (accepted)
+		if (controls.ACCEPT)
 		{
 			var daSelected:String = menuItems[curSelected];