Merge commit '0bfa6ca2a85030654ed43f72989ebdc5cfd9263e' into HEAD

libertyernie · Mar 30, 2024 · 09e17ff · 09e17ff
2 parents 6b478aa + 0bfa6ca
commit 09e17ff
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/loader/source/ppc/PADReadGC/source/PADReadGC.c b/loader/source/ppc/PADReadGC/source/PADReadGC.c
@@ -380,10 +380,7 @@ void HandleClassicController(struct BTPadCont pad, PADStatus* out) {
 	}
 #endif
 #endif
-#ifndef LI_NOEXIT
-	if (pad.button & BT_BUTTON_HOME)
-		goto DoExit;
-#elif defined LI_SHOULDER
+#ifdef LI_SHOULDER
 	if (pad.button & BT_BUTTON_HOME)
 		button |= PAD_BUTTON_START;
 #endif
@@ -1948,6 +1945,12 @@ u32 PADRead(u32 calledByGame)
 		if(BTPad[chan].used & (C_CC | C_CCP))
 		{
 			HandleClassicController(BTPad[chan], &Pad[chan]);
+
+#ifndef LI_NOEXIT
+			if (BTPad[chan].button & BT_BUTTON_HOME) {
+				goto DoExit;
+			}
+#endif
 		}
 
 //#define DEBUG_cStick	1