From 0bfa6ca2a85030654ed43f72989ebdc5cfd9263e Mon Sep 17 00:00:00 2001 From: libertyernie Date: Fri, 1 Mar 2024 15:02:37 -0500 Subject: [PATCH] Move "exit" check for home button outside of HandleClassicController so we can jump to label --- loader/source/ppc/PADReadGC/source/PADReadGC.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/loader/source/ppc/PADReadGC/source/PADReadGC.c b/loader/source/ppc/PADReadGC/source/PADReadGC.c index bfde867c..7a7d26b4 100644 --- a/loader/source/ppc/PADReadGC/source/PADReadGC.c +++ b/loader/source/ppc/PADReadGC/source/PADReadGC.c @@ -377,10 +377,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 @@ -1912,6 +1909,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