Fix random crashes when exiting app

Author: XorTroll

Goldleaf/include/base.hpp

@@ -306,7 +306,7 @@ struct Version {
 };
 
 Result Initialize();
-void Exit();
+void Finalize();
 
 inline ExecutableMode GetExecutableMode() {
     return envIsNso() ? ExecutableMode::NSO : ExecutableMode::NRO;

Goldleaf/source/base.cpp

@@ -264,9 +264,11 @@ Result Initialize() {
     return 0;
 }
 
-void Exit() {
+void Finalize() {
     if(g_MainApplication) {
+        GLEAF_LOG_FMT("Closing application...");
         g_MainApplication->Close();
+        g_MainApplication = nullptr;
     }
 
     romfsExit();
@@ -278,30 +280,29 @@ void Exit() {
         sd_exp->RenameFile(GLEAF_PATH_TEMP_UPDATE_NRO, cur_nro_file);
     }
 
-    {
-        ScopedLock lk(g_LogLock);
-        for(auto &it : g_ThreadLogBufferList) {
-            delete[] it.second;
-        }
-    }
-
     cnt::FinalizeTickets();
     cnt::FinalizeApplications();
-    fs::Finalize();
     drive::Finalize();
     amssuExit();
+    pdmqryExit();
+    nifmExit();
     usb::Finalize();
     setsysExit();
     setExit();
     psmExit();
     esExit();
     nsExit();
-    accountExit();
     ncmExit();
-    nifmExit();
-    pdmqryExit();
+    accountExit();
 
-    exit(0);
+    fs::Finalize();
+
+    {
+        ScopedLock lk(g_LogLock);
+        for(auto &it : g_ThreadLogBufferList) {
+            delete[] it.second;
+        }
+    }
 }
 
 char *GetLogBuffer() {

Goldleaf/source/cnt/cnt_Content.cpp

@@ -135,6 +135,7 @@ namespace cnt {
         }
 
         Thread g_LoadApplicationsThread;
+        std::atomic_bool g_LoadApplicationsThreadShouldExit = false;
         std::atomic_bool g_LoadApplicationsThreadDone = true;
 
         void ScanApplications() {
@@ -146,6 +147,11 @@ namespace cnt {
 
             // Try to get application views and control data
             for(auto &app: g_Applications) {
+                if(g_LoadApplicationsThreadShouldExit) {
+                    g_LoadApplicationsThreadShouldExit = false;
+                    return;
+                }
+
                 if(R_SUCCEEDED(nsGetApplicationView(reinterpret_cast<NsApplicationView*>(&app.view), &app.record.id, 1))) {
                     for(u32 i = 0; i < sizeof(app.view.flags) * CHAR_BIT; i++) {
                         if(app.view.flags & BIT(i)) {
@@ -314,6 +320,8 @@ namespace cnt {
     }
 
     void FinalizeApplications() {
+        g_LoadApplicationsThreadShouldExit = true;
+        threadWaitForExit(&g_LoadApplicationsThread);
         threadClose(&g_LoadApplicationsThread);
     }
 

Goldleaf/source/cnt/cnt_Ticket.cpp

@@ -137,6 +137,7 @@ namespace cnt {
     }
 
     void FinalizeTickets() {
+        threadWaitForExit(&g_LoadTicketsThread);
         threadClose(&g_LoadTicketsThread);
     }
 

Goldleaf/source/main.cpp

@@ -21,8 +21,8 @@
 
 #include <ui/ui_MainApplication.hpp>
 
-ui::MainApplication::Ref g_MainApplication;
-cfg::Settings g_Settings;
+ui::MainApplication::Ref g_MainApplication = nullptr;
+cfg::Settings g_Settings = {};
 bool g_UpdatedNeedsRename = false;
 
 int main() {
@@ -61,5 +61,8 @@ int main() {
     // Start and loop the application
     g_MainApplication->ShowWithFadeIn();
 
-    Exit();
+    GLEAF_LOG_FMT("Exiting Goldleaf...");
+
+    Finalize();
+    return 0;
 }