From 806d0033deef5d9685bb262842cb5e76d8782b3d Mon Sep 17 00:00:00 2001
From: LiquidFenrir <liquidfenrir@outlook.fr>
Date: Sun, 5 Jun 2022 11:49:09 +0200
Subject: [PATCH]  fix multiple crashes

on exit:
- bad timing when the install checks threads run, could crash
- quitting through HOME when a bgm was previewed in the browser
on http get failure:
- the quit flag would be enabled, but the browser wouldn't honour it
---
 source/main.c   | 10 +++++++++-
 source/remote.c | 15 ++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/source/main.c b/source/main.c
index 2b5e405..0d07958 100644
--- a/source/main.c
+++ b/source/main.c
@@ -109,6 +109,12 @@ static void stop_install_check(void)
     {
         installCheckThreads_arg[i].run_thread = false;
     }
+    for(int i = 0; i < MODE_AMOUNT; i++)
+    {
+        threadJoin(installCheckThreads[i], U64_MAX);
+        threadFree(installCheckThreads[i]);
+        installCheckThreads[i] = NULL;
+    }
 }
 
 static void exit_thread(void)
@@ -121,6 +127,7 @@ static void exit_thread(void)
         svcWaitSynchronization(update_icons_mutex, U64_MAX);
         threadJoin(iconLoadingThread, U64_MAX);
         threadFree(iconLoadingThread);
+        iconLoadingThread = NULL;
     }
 }
 
@@ -138,6 +145,7 @@ static void free_icons(Entry_List_s * list)
         free(list->icons[i]);
     }
     free(list->icons);
+    list->icons = NULL;
 }
 
 void free_lists(void)
@@ -230,7 +238,7 @@ static void load_lists(Entry_List_s * lists)
 
             if(install_check_function != NULL)
             {
-                installCheckThreads[i] = threadCreate(install_check_function, current_arg, __stacksize__, 0x3f, -2, true);
+                installCheckThreads[i] = threadCreate(install_check_function, current_arg, __stacksize__, 0x3f, -2, false);
                 svcSleepThread(1e8);
             }
         }
diff --git a/source/remote.c b/source/remote.c
index 8145002..797e495 100644
--- a/source/remote.c
+++ b/source/remote.c
@@ -483,7 +483,7 @@ bool themeplaza_browser(EntryMode mode)
 
     bool extra_mode = false;
 
-    while (aptMainLoop())
+    while (aptMainLoop() && !quit)
     {
         if (current_list->entries == NULL)
             break;
@@ -511,12 +511,6 @@ bool themeplaza_browser(EntryMode mode)
         exit:
             quit = true;
             downloaded = false;
-            if (audio)
-            {
-                audio->stop = true;
-                svcWaitSynchronization(audio->finished, U64_MAX);
-                audio = NULL;
-            }
             break;
         }
 
@@ -725,6 +719,13 @@ bool themeplaza_browser(EntryMode mode)
         }
     }
 
+    if (audio)
+    {
+        audio->stop = true;
+        svcWaitSynchronization(audio->finished, U64_MAX);
+        audio = NULL;
+    }
+
     free_preview(preview);
 
     free_icons(current_list);