diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java index d9c11fb97..e66533e62 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java @@ -69,6 +69,12 @@ public class GamePropertiesActivity extends AppCompatActivity { setTitle(mGameListEntry.getTitle()); } + @Override + protected void onSaveInstanceState(@NonNull Bundle outState) { + super.onSaveInstanceState(outState); + outState.remove("android:support:fragments"); + } + @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { if (item.getItemId() == android.R.id.home) { 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 1ce1d438a..c7ec62228 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 @@ -656,10 +656,9 @@ public class TouchscreenControllerView extends FrameLayout { mPointerButtonCode, true); } - final int pointerId = event.getPointerId(0); AndroidHostInterface.getInstance().setMousePosition( - (int)event.getX(pointerId), - (int)event.getY(pointerId)); + (int)event.getX(0), + (int)event.getY(0)); } return true;