Merge pull request #9243 from JosJuice/android-input-overlay-null

Android: Add null check for InputOverlay
dolphin-emu · Nov 11, 2020 · 9e3e325 · 9e3e325
2 parents ae83685 + 32ad2dc
commit 9e3e325
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
@@ -94,14 +94,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
       doneButton.setOnClickListener(v -> stopConfiguringControls());
     }
 
-    contents.post(() ->
+    if (mInputOverlay != null)
     {
-      int overlayX = mInputOverlay.getLeft();
-      int overlayY = mInputOverlay.getTop();
-      mInputOverlay.setSurfacePosition(new Rect(
-              surfaceView.getLeft() - overlayX, surfaceView.getTop() - overlayY,
-              surfaceView.getRight() - overlayX, surfaceView.getBottom() - overlayY));
-    });
+      contents.post(() ->
+      {
+        int overlayX = mInputOverlay.getLeft();
+        int overlayY = mInputOverlay.getTop();
+        mInputOverlay.setSurfacePosition(new Rect(
+                surfaceView.getLeft() - overlayX, surfaceView.getTop() - overlayY,
+                surfaceView.getRight() - overlayX, surfaceView.getBottom() - overlayY));
+      });
+    }
 
     // The new Surface created here will get passed to the native code via onSurfaceChanged.