Merge 5a0808d989 into c650473fdc

2026-04-29 15:33:35 -06:00 · 2026-04-06 19:59:32 +02:00 · 2026-04-06 19:59:32 +02:00 · 63368e3202
commit 63368e3202
parent c650473fdc 5a0808d989
1 changed files with 3 additions and 0 deletions
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
@ -543,6 +543,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
    }

    override fun onDestroy() {
+        if (::emulationState.isInitialized) {
+            emulationState.stop()
+        }
        EmulationLifecycleUtil.removeHook(onPause)
        EmulationLifecycleUtil.removeHook(onShutdown)
        if (gameFd != null) {