From 13af9173e8f105f17e54386a497b8da752be40ab Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 27 Jan 2014 03:58:27 -0500
Subject: [PATCH] Let standard controllers handle Moga L2 / R2 when custom

---
 shell/android/src/com/reicast/emulator/GL2JNIActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index e60ce04cc..e2e00b496 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -384,7 +384,8 @@ public class GL2JNIActivity extends Activity {
 			if (playerNum == null)
 				return false;
 
-			if (!moga.isActive[playerNum]) {
+			if (!moga.isActive[playerNum] && !custom[playerNum]) {
+				// TODO: Moga should handle this locally
 
 				// Joystick
 				if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {