From 3640293f40318c0c5ddf9f208344fbf3719eb6d7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 6 Mar 2014 04:54:55 -0500 Subject: [PATCH] [Android] Join a duplicate if statement in InputFragment's MOGAListener. --- .../com/reicast/emulator/config/InputFragment.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/shell/android/src/com/reicast/emulator/config/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java index a49faebca..5875ed689 100644 --- a/shell/android/src/com/reicast/emulator/config/InputFragment.java +++ b/shell/android/src/com/reicast/emulator/config/InputFragment.java @@ -510,13 +510,14 @@ public class InputFragment extends Fragment { } public void onStateEvent(StateEvent event) { - if (event.getState() == StateEvent.STATE_CONNECTION - && event.getAction() == MOGAInput.ACTION_CONNECTED) { + if (event.getState() == StateEvent.STATE_CONNECTION && + event.getAction() == MOGAInput.ACTION_CONNECTED) { + int mControllerVersion = moga.mController - .getState(Controller.STATE_CURRENT_PRODUCT_VERSION); - if (mControllerVersion == Controller.ACTION_VERSION_MOGAPRO) { - pad.isActiveMoga[playerNum] = true; - } else if (mControllerVersion == Controller.ACTION_VERSION_MOGA) { + .getState(Controller.STATE_CURRENT_PRODUCT_VERSION); + + if (mControllerVersion == Controller.ACTION_VERSION_MOGA || + mControllerVersion == Controller.ACTION_VERSION_MOGAPRO) { pad.isActiveMoga[playerNum] = true; } }