diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 64663b0845..0c82eed3ea 100644 --- 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) {