From 0280f3557c703beb4c14df7aab543349bfc001ea Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 6 Nov 2020 19:26:56 +0100 Subject: Android: Finish EmulationActivity from C++ This makes EmulationActivity automatically close if booting fails, and lets us get rid of s_emulation_end_event. --- .../main/java/org/dolphinemu/dolphinemu/NativeLibrary.java | 14 ++++++++++++++ .../dolphinemu/activities/EmulationActivity.java | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'Source/Android/app/src/main/java') diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 199d80cf72..9e7c9bb208 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -563,6 +563,20 @@ public final class NativeLibrary sEmulationActivity.clear(); } + public static void finishEmulationActivity() + { + final EmulationActivity emulationActivity = sEmulationActivity.get(); + if (emulationActivity == null) + { + Log.warning("[NativeLibrary] EmulationActivity is null."); + } + else + { + Log.verbose("[NativeLibrary] Finishing EmulationActivity."); + emulationActivity.runOnUiThread(emulationActivity::finish); + } + } + public static void updateTouchPointer() { final EmulationActivity emulationActivity = sEmulationActivity.get(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 49f9704e86..daa202de7c 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -342,7 +342,6 @@ public final class EmulationActivity extends AppCompatActivity if (keyCode == KeyEvent.KEYCODE_BACK) { mEmulationFragment.stopEmulation(); - finish(); return true; } return super.onKeyLongPress(keyCode, event); @@ -617,7 +616,6 @@ public final class EmulationActivity extends AppCompatActivity case MENU_ACTION_EXIT: mEmulationFragment.stopEmulation(); - finish(); break; } } -- cgit v1.2.3