diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-09-15 05:22:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 05:22:00 +0200 |
| commit | 958bed4545f823a56bbf4849012e0283f524603b (patch) | |
| tree | 782dd862f000d126bf1c251ccc12575e18a17f6e | |
| parent | Merge pull request #11506 from t895/icon-fix (diff) | |
| parent | android: Return the correct status code on emulation stop (diff) | |
| download | yuzu-958bed4545f823a56bbf4849012e0283f524603b.tar yuzu-958bed4545f823a56bbf4849012e0283f524603b.tar.gz yuzu-958bed4545f823a56bbf4849012e0283f524603b.tar.bz2 yuzu-958bed4545f823a56bbf4849012e0283f524603b.tar.lz yuzu-958bed4545f823a56bbf4849012e0283f524603b.tar.xz yuzu-958bed4545f823a56bbf4849012e0283f524603b.tar.zst yuzu-958bed4545f823a56bbf4849012e0283f524603b.zip | |
| -rw-r--r-- | src/android/app/src/main/jni/native.cpp | 5 |
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: 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() { |