From 65527cfb69792158b02df610eeda425065142e2a Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Mon, 17 Feb 2025 01:47:59 -0600
Subject: [PATCH] Reload configuration from global & reload app list at the end
 of the render loop (when it's done)

---
 src/Ryujinx/AppHost.cs                     | 14 +++++++-------
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs |  5 -----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index b345eb362..ba0837725 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -582,13 +582,6 @@ namespace Ryujinx.Ava
             Rainbow.Disable();
             Rainbow.Reset();
 
-            // Reload settings when the game is turned off
-            // (resets custom settings if there were any)
-            Program.ReloadConfig();
-
-            //Updates the gameList (changes the status of the user setting if it was added or removed during the game)
-            RyujinxApp.MainWindow.GameListUpdate();
-
             _isStopped = true;
             Stop();
         }
@@ -1125,6 +1118,13 @@ namespace Ryujinx.Ava
             });
 
             (RendererHost.EmbeddedWindow as EmbeddedWindowOpenGL)?.MakeCurrent(true);
+            
+            // Reload settings when the game is turned off
+            // (resets custom settings if there were any)
+            Program.ReloadConfig();
+
+            // Reload application list (changes the status of the user setting if it was added or removed during the game)
+            Dispatcher.UIThread.Post(() => RyujinxApp.MainWindow.LoadApplications());
         }
 
         public void InitStatus()
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index 60d728088..509f4df8e 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -660,11 +660,6 @@ namespace Ryujinx.Ava.UI.Windows
             ReloadGameList();
         }
 
-        public void GameListUpdate()
-        {
-            ReloadGameList();
-        }
-
         public void ToggleFileType(string fileType)
         {
             switch (fileType)