Merge pull request #370 from mstevetodd/master

avoid out of bounds error reported to Play Store
JMRI · Oct 30, 2018 · 901f938 · 901f938
2 parents 08a31e9 + 3a1aab3
commit 901f938
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/EngineDriver/src/main/java/jmri/enginedriver/throttle.java b/EngineDriver/src/main/java/jmri/enginedriver/throttle.java
@@ -2526,7 +2526,7 @@ public boolean dispatchGenericMotionEvent(android.view.MotionEvent event) {
                 int repeatCnt = 0;
                 int whichGamePadIsEventFrom = findWhichGamePadEventIsFrom(event.getDeviceId(), 0); // dummy eventKeyCode
 
-                if (whichGamePadIsEventFrom > -1) { // the event came for a gamepad
+                if ((whichGamePadIsEventFrom > -1) && (whichGamePadIsEventFrom < gamePadDeviceIdsTested.length)) { // the event came from a gamepad
                     if (gamePadDeviceIdsTested[getGamePadIndexFromThrottleNo(whichGamePadIsEventFrom)]!=GAMEPAD_GOOD) { //if not, testing for this gamepad is not complete or has failed
                         acceptEvent = false;
                     }
@@ -2610,7 +2610,7 @@ public boolean dispatchKeyEvent(KeyEvent event) {
                 int whichThrottle;
                 int whichGamePadIsEventFrom = findWhichGamePadEventIsFrom(event.getDeviceId(), event.getKeyCode());
 
-                if (whichGamePadIsEventFrom > -1) { // the event came for a gamepad
+                if ((whichGamePadIsEventFrom > -1) && (whichGamePadIsEventFrom < gamePadDeviceIdsTested.length)) { // the event came from a gamepad
                     if (gamePadDeviceIdsTested[getGamePadIndexFromThrottleNo(whichGamePadIsEventFrom)]!=GAMEPAD_GOOD) { //if not, testing for this gamepad is not complete or has failed
                         acceptEvent = false;
                     }