summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Charles Lombardo2023-09-14 23:03:19 -0400
committerGravatar Charles Lombardo2023-09-14 23:08:06 -0400
commit7e2bd395bc1ffe986a3965dc2872e4c87e63ce58 (patch)
tree031755fdf615bf00e4a559140dec7860f7a060a0 /src
parentMerge pull request #11505 from t895/config-patch (diff)
downloadyuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar.gz
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.tar.xz
yuzu-7e2bd395bc1ffe986a3965dc2872e4c87e63ce58.zip
android: Return the correct status code on emulation stop
Diffstat (limited to '')
-rw-r--r--src/android/app/src/main/jni/native.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 8ac28b638..8a2021ff0 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -327,12 +327,13 @@ public:
327 m_system.ShutdownMainProcess(); 327 m_system.ShutdownMainProcess();
328 m_detached_tasks.WaitForAllTasks(); 328 m_detached_tasks.WaitForAllTasks();
329 m_load_result = Core::SystemResultStatus::ErrorNotInitialized; 329 m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
330 m_window.reset();
331 OnEmulationStopped(Core::SystemResultStatus::Success);
332 return;
330 } 333 }
331 334
332 // Tear down the render window. 335 // Tear down the render window.
333 m_window.reset(); 336 m_window.reset();
334
335 OnEmulationStopped(m_load_result);
336 } 337 }
337 338
338 void PauseEmulation() { 339 void PauseEmulation() {