Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash related to unpause being called after stop

Browse Source
This commit is contained in:
xperia64 2021-01-19 22:04:16 -05:00 committed by bunnei
parent ce6b480bee
commit 0184e1af53
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
View File

@ -229,9 +229,9 @@ public final class EmulationActivity extends AppCompatActivity {
finish(); finish();
}) })
.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> .setNegativeButton(android.R.string.cancel, (dialogInterface, i) ->
{ NativeLibrary.UnPauseEmulation())
}).setOnDismissListener(dialogInterface -> .setOnCancelListener(dialogInterface ->
NativeLibrary.UnPauseEmulation()) NativeLibrary.UnPauseEmulation())
.create() .create()
.show(); .show();
} }

1
src/android/app/src/main/jni/native.cpp
View File

@ -333,6 +333,7 @@ jobjectArray Java_org_citra_citra_1emu_NativeLibrary_GetInstalledGamePaths(
return jgames; 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, void Java_org_citra_citra_1emu_NativeLibrary_UnPauseEmulation(JNIEnv* env,
[[maybe_unused]] jclass clazz) { [[maybe_unused]] jclass clazz) {
pause_emulation = false; pause_emulation = false;