Prevent hangs on application exit

Nightkingale · Apr 13, 2024 · 1026f97 · 1026f97
1 parent dfd23fc
commit 1026f97
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/source/main.cpp b/source/main.cpp
@@ -25,11 +25,17 @@ std::string MII_NICKNAME;
 std::string ACCOUNT_FILE;
 
 void deinitialize() {
-    nn::act::Finalize();
-    Mocha_UnmountFS("storage_mlc");
-    Mocha_DeInitLibrary();
-    WHBLogConsoleFree();
-    WHBProcShutdown();
+    // This prevents hangs when called twice.
+    static bool isDeinitialized = false;
+
+    if (isDeinitialized) {
+        nn::act::Finalize();
+        Mocha_UnmountFS("storage_mlc");
+        Mocha_DeInitLibrary();
+        WHBLogConsoleFree();
+        WHBProcShutdown();
+        isDeinitialized = true;
+    }
 }
 
 void initialize() {