Merge pull request #11507 from t895/emulation-stop-fix

android: Return the correct status code on emulation stop
3 years ago · 1fd72951b8
1 changed files with 3 additions and 2 deletions
--- 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() {