From d736dc1a0a2bdefb15ecc2b742ad0d981c02e2cb Mon Sep 17 00:00:00 2001 From: FlatOutPS2 Date: Thu, 9 Jun 2016 19:20:50 +0200 Subject: [PATCH] LilyPad PS1 analog mode fix Fixes issue where "Use analog mode if possible - PS1 only" would enable analog mode when playing games that don't support it. --- plugins/LilyPad/LilyPad.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/LilyPad/LilyPad.cpp b/plugins/LilyPad/LilyPad.cpp index 23aee99d0c..27e50ed4ad 100644 --- a/plugins/LilyPad/LilyPad.cpp +++ b/plugins/LilyPad/LilyPad.cpp @@ -773,9 +773,6 @@ void ResetPad(int port, int slot) { pads[port][slot].umask[0] = pads[port][slot].umask[1] = 0xFF; // Sets up vibrate variable. ResetVibrate(port, slot); - if (config.padConfigs[port][slot].autoAnalog && !ps2e) { - pads[port][slot].mode = MODE_ANALOG; - } pads[port][slot].initialized = 1; pads[port][slot].enabled = enabled; @@ -1176,6 +1173,9 @@ u8 CALLBACK PADpoll(u8 value) { // CONFIG_MODE case 0x43: if (pad->config) { + if (pad->mode == MODE_DIGITAL && config.padConfigs[query.port][query.slot].autoAnalog && !ps2e) { + pad->mode = MODE_ANALOG; + } // In config mode. Might not actually be leaving it. SET_RESULT(ConfigExit); DEBUG_OUT(0xF3);