Merge pull request #11989 from JosJuice/android-title-on-shutdown

Android: Handle game shutdown in onTitleChanged

1 files changed, 7 insertions, 2 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
index 9d189eac32..8ad871a57d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
@@ -234,9 +234,14 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
             menuToastShown = true
         }
 
-        title = NativeLibrary.GetCurrentTitleDescription()
+        try {
+            title = NativeLibrary.GetCurrentTitleDescription()
 
-        emulationFragment?.refreshInputOverlay()
+            emulationFragment?.refreshInputOverlay()
+        } catch (_: IllegalStateException) {
+            // Most likely the core delivered an onTitleChanged while emulation was shutting down.
+            // Let's just ignore it, since we're about to shut down anyway.
+        }
     }
 
     override fun onDestroy() {