summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java12
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);