Merge pull request #9082 from JosJuice/android-touch-pointer-recreate

Android: Fix touch pointer not working after activity recreation

1 files changed, 11 insertions, 1 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
index ea1a6ecb54..f4878168ca 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
@@ -123,7 +123,17 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
       defaultOverlay();
 
     // Load the controls.
-    refreshControls();
+    if (NativeLibrary.IsRunning())
+    {
+      // We would've needed a refreshControls call here in addition to the initTouchPointer call
+      // if it wasn't for initTouchPointer calling refreshControls.
+      initTouchPointer();
+    }
+    else
+    {
+      // We can't call initTouchPointer yet because it needs the aspect ratio of the running game.
+      refreshControls();
+    }
 
     // Set the on touch listener.
     setOnTouchListener(this);