From e7bf22c31f2723bbf6ab63f546133415f858eb0b Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Fri, 9 Oct 2020 18:34:42 +1000
Subject: [PATCH] Android: Possible fix for multi-touch-stuck issue

---
 .../github/stenzek/duckstation/TouchscreenControllerView.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java b/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java
index f01d7c448..17df2aa85 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java
@@ -93,10 +93,14 @@ public class TouchscreenControllerView extends FrameLayout {
             {
                 Rect rect = new Rect();
                 final int pointerCount = event.getPointerCount();
+                final int liftedPointerIndex = (event.getActionMasked() == MotionEvent.ACTION_POINTER_UP) ? event.getActionIndex() : -1;
                 for (TouchscreenControllerButtonView buttonView : mButtonViews) {
                     buttonView.getHitRect(rect);
                     boolean pressed = false;
                     for (int i = 0; i < pointerCount; i++) {
+                        if (i == liftedPointerIndex)
+                            continue;
+
                         final int x = (int) event.getX(i);
                         final int y = (int) event.getY(i);
                         pressed |= rect.contains(x, y);