Explorar o código

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

android: Return the correct status code on emulation stop
Charles Lombardo %!s(int64=2) %!d(string=hai) anos
pai
achega
958bed4545
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      src/android/app/src/main/jni/native.cpp

+ 3 - 2
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() {