From 0cfdfaf95927f0bc25d34744292c41d0d344c5e2 Mon Sep 17 00:00:00 2001
From: XaviDCR92 <xavi.dcr@gmail.com>
Date: Sat, 19 Aug 2017 17:19:53 +0200
Subject: * (Bugfix): padx_last_key_single_pressed was being checked AFTER
 checking pads connected, so it was never calculated if, for example, pad 2
 was disconnected. This was only reproducible under real hardware.

---
 Source/Makefile | 2 +-
 Source/Pad.c    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'Source')

diff --git a/Source/Makefile b/Source/Makefile
index 7393dd1..5b49052 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -22,7 +22,7 @@ PATH := $(PATH):$(PSXSDK_PATH)/bin/
 PROJECT_DIR = ~/$(PROJECT)
 
 #Uncomment this DEFINE below to use Airport together with OpenSend + QPSXSerial toolchain.
-#DEFINE +=  -DSERIAL_INTERFACE
+DEFINE +=  -DSERIAL_INTERFACE
 
 # PSXSDK tools definitions
 # ELF2EXE:
diff --git a/Source/Pad.c b/Source/Pad.c
index e68804b..8ea13dc 100644
--- a/Source/Pad.c
+++ b/Source/Pad.c
@@ -313,6 +313,7 @@ bool UpdatePads(void)
 {
     unsigned short adc_mouse;
     static unsigned short old_adc_mouse;
+    bool both_pads_connected = true;
     
     PadOneVibrationHandler();
 	
@@ -344,12 +345,12 @@ bool UpdatePads(void)
     
 	if(PadOneConnected() == false)
 	{
-		return false;
+		both_pads_connected = false;
 	}
 
     if(PadTwoConnected() == false)
     {
-        return false;
+        both_pads_connected = false;
     }
 
 	if(!(previous_pad1 & pad1) )
@@ -370,7 +371,7 @@ bool UpdatePads(void)
 		pad2_last_key_single_pressed = 0;
 	}
 	
-	return true;
+	return both_pads_connected;
 }
 
 bool PadOneKeyReleased(unsigned short key)
-- 
cgit v1.2.3