Merge PR 12142

2023-11-24 00:57:08 +00:00
parent 24b2842914
commit 8d65fb6c74
1 changed files with 4 additions and 2 deletions
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -316,8 +316,10 @@ void EmulationSession::ShutdownEmulation() {

    m_is_running = false;

-    // Unload user input.
-    m_system.HIDCore().UnloadInputDevices();
+    SCOPE_EXIT({
+        // Unload user input.
+        m_system.HIDCore().UnloadInputDevices();
+    });

    // Shutdown the main emulated process
    if (m_load_result == Core::SystemResultStatus::Success) {