From cab213436b7bc361317efbb00a228cb1d740f12a Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Thu, 3 Oct 2019 21:59:30 -0400
Subject: [PATCH] android: native: Change order of EmuWindow teardown.

- This needs to happen after system shutdown for asynchronous GPU.
---
 src/android/app/src/main/jni/native.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 080557a28..f8d8eacd7 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -123,6 +123,9 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
         return Core::System::ResultStatus::ErrorLoader;
     }
 
+    window = std::make_unique<EmuWindow_Android>(s_surf);
+    SCOPE_EXIT({ window.reset(); });
+
     Core::System& system{Core::System::GetInstance()};
     SCOPE_EXIT({ system.Shutdown(); });
 
@@ -139,9 +142,6 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     InputManager::Init();
     SCOPE_EXIT({ InputManager::Shutdown(); });
 
-    window = std::make_unique<EmuWindow_Android>(s_surf);
-    SCOPE_EXIT({ window.reset(); });
-
     const Core::System::ResultStatus load_result{system.Load(*window, filepath)};
     if (load_result != Core::System::ResultStatus::Success) {
         return load_result;