Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

android: Return the correct status code on emulation stop

Charles Lombardo52d7075ae0cb
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 8ac28b6386..8a2021ff06 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -327,12 +327,13 @@ public:
m_system.ShutdownMainProcess();
m_detached_tasks.WaitForAllTasks();
m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
+ m_window.reset();
+ OnEmulationStopped(Core::SystemResultStatus::Success);
+ return;
}
// Tear down the render window.
m_window.reset();
-
- OnEmulationStopped(m_load_result);
}
void PauseEmulation() {