From 1915c2de49ffb2c8b2c7519cc893909a043025b3 Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Fri, 20 Mar 2020 06:39:39 -0700
Subject: [PATCH] Prevent crash when only one controller has moved (#3010)

---
 .../org/mozilla/vrbrowser/input/MotionEventGenerator.java       | 2 +-
 1 file changed, 1 insertion(+), 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
index 7b2e48288..840038b32 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java
@@ -130,7 +130,7 @@ public static void dispatch(Widget aWidget, int aDevice, boolean aFocused, boole
                 device.mHoverStartWidget = null;
             }
             for (int i=0; i<devices.size(); i++) {
-                if (devices.get(i) != device && devices.get(i).mHoverStartWidget != null) {
+                if (devices.get(i) != null && devices.get(i) != device && devices.get(i).mHoverStartWidget != null) {
                     generateEvent(devices.get(i).mHoverStartWidget, devices.get(i), aFocused, MotionEvent.ACTION_HOVER_EXIT, true);
                 }
             }