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 3ae9ac1cdee5..c55bc1cdc323 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 @@ -319,6 +319,10 @@ else if(button.getTrackId() == pointerId) if(button.getTrackId() == pointerId) { button.onPointerUp(pointerId, pointerX, pointerY); + if (mOverlayPointer != null && button.getId() == ButtonType.HOTKEYS_UPRIGHT_TOGGLE) + { + mOverlayPointer.reset(); + } isProcessed = true; } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java index cfba537590d8..753af735efe4 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java @@ -27,6 +27,16 @@ public InputOverlayPointer(float width, float height) mTrackId = -1; } + public void reset() + { + mTrackId = -1; + mAxises[0] = mAxises[1] = mAxises[2] = mAxises[3] = 0; + for (int i = 0; i < 4; i++) + { + NativeLibrary.onGamePadMoveEvent(NativeLibrary.TouchScreenDevice, mAxisIDs[i], mAxises[i]); + } + } + public int getTrackId() { return mTrackId;