From c28b79434958dfcc973d33b1dd53fb7384e9b2e3 Mon Sep 17 00:00:00 2001
From: LiquidFenrir <liquidfenrir@outlook.fr>
Date: Fri, 11 May 2018 14:04:31 +0200
Subject: [PATCH] update remote.c to fix bgm preview there as well

---
 source/main.c   |  4 ++--
 source/remote.c | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/source/main.c b/source/main.c
index 3e6c63d..1eb6179 100644
--- a/source/main.c
+++ b/source/main.c
@@ -37,7 +37,7 @@
 #include <time.h>
 
 bool quit = false;
-audio_s * audio;
+audio_s * audio = NULL;
 static bool homebrew = false;
 static bool installed_themes = false;
 
@@ -136,7 +136,7 @@ void free_lists(void)
 
 void exit_function(bool power_pressed)
 {
-    if (audio) 
+    if(audio)
     {
         audio->stop = true;
         svcWaitSynchronization(audio->finished, U64_MAX);
diff --git a/source/remote.c b/source/remote.c
index e3b8c83..cc6039c 100644
--- a/source/remote.c
+++ b/source/remote.c
@@ -522,15 +522,17 @@ bool themeplaza_browser(EntryMode mode)
         u32 kHeld = hidKeysHeld();
         u32 kUp = hidKeysUp();
 
-
-
         if(kDown & KEY_START)
         {
             exit:
             quit = true;
             downloaded = false;
             if(audio)
+            {
                 audio->stop = true;
+                svcWaitSynchronization(audio->finished, U64_MAX);
+                audio = NULL;
+            }
             break;
         }
 
@@ -588,7 +590,11 @@ bool themeplaza_browser(EntryMode mode)
             {
                 preview_mode = false;
                 if(mode == MODE_THEMES && audio)
+                {
                     audio->stop = true;
+                    svcWaitSynchronization(audio->finished, U64_MAX);
+                    audio = NULL;
+                }
             }
         }
         else if(kDown & KEY_B)
@@ -597,7 +603,11 @@ bool themeplaza_browser(EntryMode mode)
             {
                 preview_mode = false;
                 if(mode == MODE_THEMES && audio)
+                {
                     audio->stop = true;
+                    svcWaitSynchronization(audio->finished, U64_MAX);
+                    audio = NULL;
+                }
             }
             else
                 break;
@@ -683,7 +693,11 @@ bool themeplaza_browser(EntryMode mode)
                 {
                     preview_mode = false;
                     if(mode == MODE_THEMES && audio)
+                    {
                         audio->stop = true;
+                        svcWaitSynchronization(audio->finished, U64_MAX);
+                        audio = NULL;
+                    }
                     continue;
                 }
                 else if(y < 24)