Only check device if it exists (#2975)

Fixes a crash where if one of the controllers has not been used and is not part of the device table would cause a crash.
MozillaReality · Mar 17, 2020 · 5ea4ceb · 5ea4ceb
1 parent 6fd782c
commit 5ea4ceb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java b/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java
@@ -155,7 +155,9 @@ private static boolean isOtherDeviceDown(int deviceId) {
         boolean result = false;
         for (int i=0; i<devices.size(); i++) {
             if (i != deviceId) {
-                result |= devices.get(i).mTouchStartWidget != null;
+                if (devices.get(i) != null) {
+                    result |= devices.get(i).mTouchStartWidget != null;
+                }
             }
         }