From 0184e1af5385fab4854aa903d31fcf17b4e8f11b Mon Sep 17 00:00:00 2001
From: xperia64 <xperiancedapps@gmail.com>
Date: Tue, 19 Jan 2021 22:04:16 -0500
Subject: [PATCH] Fix crash related to unpause being called after stop

---
 .../org/citra/citra_emu/activities/EmulationActivity.java   | 6 +++---
 src/android/app/src/main/jni/native.cpp                     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
index b9b4c6b01..adddcf110 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
@@ -229,9 +229,9 @@ public final class EmulationActivity extends AppCompatActivity {
                     finish();
                 })
                 .setNegativeButton(android.R.string.cancel, (dialogInterface, i) ->
-                {
-                }).setOnDismissListener(dialogInterface ->
-                NativeLibrary.UnPauseEmulation())
+                    NativeLibrary.UnPauseEmulation())
+                .setOnCancelListener(dialogInterface ->
+                    NativeLibrary.UnPauseEmulation())
                 .create()
                 .show();
     }
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 278ea8439..b87d2ac7d 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -333,6 +333,7 @@ jobjectArray Java_org_citra_citra_1emu_NativeLibrary_GetInstalledGamePaths(
     return jgames;
 }
 
+// TODO(xperia64): ensure these cannot be called in an invalid state (e.g. after StopEmulation)
 void Java_org_citra_citra_1emu_NativeLibrary_UnPauseEmulation(JNIEnv* env,
                                                               [[maybe_unused]] jclass clazz) {
     pause_emulation = false;