From 79c401740c1b29194dd66e6035beac8dd3b59eab Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Fri, 29 Jul 2022 22:20:07 +1000
Subject: [PATCH] FullscreenUI: Fix changing per-game settings not updating

---
 src/frontend-common/fullscreen_ui.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp
index 63d0836e5..4d9f9bcec 100644
--- a/src/frontend-common/fullscreen_ui.cpp
+++ b/src/frontend-common/fullscreen_ui.cpp
@@ -614,7 +614,12 @@ void FullscreenUI::Render()
   {
     auto lock = Host::GetSettingsLock();
     GetEditingSettingsInterface()->Save();
-    Host::RunOnCPUThread([]() { System::ApplySettings(false); });
+    Host::RunOnCPUThread([gs = IsEditingGameSettings()]() {
+      if (gs)
+        System::ReloadGameSettings(false);
+      else
+        System::ApplySettings(false);
+    });
   }
 
   ImGuiFullscreen::ResetCloseMenuIfNeeded();