From f99d5ff39da01f6e5a3d31df5e7224f7e22932c0 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Tue, 13 Aug 2024 15:51:56 +1000
Subject: [PATCH] FullscreenUI: Fix saving of list options (e.g. controller
 settings)

---
 src/core/fullscreen_ui.cpp | 54 ++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp
index ea1f96e78..408845eb3 100644
--- a/src/core/fullscreen_ui.cpp
+++ b/src/core/fullscreen_ui.cpp
@@ -1939,7 +1939,8 @@ void FullscreenUI::DrawIntListSetting(SettingsInterface* bsi, const char* title,
                               (i == static_cast<size_t>(index)));
     }
     OpenChoiceDialog(title, false, std::move(cd_options),
-                     [game_settings, section, key, option_offset](s32 index, const std::string& title, bool checked) {
+                     [game_settings, section = TinyString(section), key = TinyString(key),
+                      option_offset](s32 index, const std::string& title, bool checked) {
                        if (index >= 0)
                        {
                          auto lock = Host::GetSettingsLock();
@@ -2556,30 +2557,30 @@ void FullscreenUI::DrawEnumSetting(SettingsInterface* bsi, const char* title, co
     for (u32 i = 0; i < static_cast<u32>(option_count); i++)
       cd_options.emplace_back(to_display_string_function(static_cast<DataType>(i)),
                               (typed_value.has_value() && i == static_cast<u32>(typed_value.value())));
-    OpenChoiceDialog(
-      title, false, std::move(cd_options),
-      [section, key, to_string_function, game_settings](s32 index, const std::string& title, bool checked) {
-        if (index >= 0)
-        {
-          auto lock = Host::GetSettingsLock();
-          SettingsInterface* bsi = GetEditingSettingsInterface(game_settings);
-          if (game_settings)
-          {
-            if (index == 0)
-              bsi->DeleteValue(section, key);
-            else
-              bsi->SetStringValue(section, key, to_string_function(static_cast<DataType>(index - 1)));
-          }
-          else
-          {
-            bsi->SetStringValue(section, key, to_string_function(static_cast<DataType>(index)));
-          }
+    OpenChoiceDialog(title, false, std::move(cd_options),
+                     [section = TinyString(section), key = TinyString(key), to_string_function,
+                      game_settings](s32 index, const std::string& title, bool checked) {
+                       if (index >= 0)
+                       {
+                         auto lock = Host::GetSettingsLock();
+                         SettingsInterface* bsi = GetEditingSettingsInterface(game_settings);
+                         if (game_settings)
+                         {
+                           if (index == 0)
+                             bsi->DeleteValue(section, key);
+                           else
+                             bsi->SetStringValue(section, key, to_string_function(static_cast<DataType>(index - 1)));
+                         }
+                         else
+                         {
+                           bsi->SetStringValue(section, key, to_string_function(static_cast<DataType>(index)));
+                         }
 
-          SetSettingsChanged(bsi);
-        }
+                         SetSettingsChanged(bsi);
+                       }
 
-        CloseChoiceDialog();
-      });
+                       CloseChoiceDialog();
+                     });
   }
 }
 void FullscreenUI::DrawFloatListSetting(SettingsInterface* bsi, const char* title, const char* summary,
@@ -2632,7 +2633,8 @@ void FullscreenUI::DrawFloatListSetting(SettingsInterface* bsi, const char* titl
                               (value.has_value() && i == static_cast<size_t>(index)));
     }
     OpenChoiceDialog(title, false, std::move(cd_options),
-                     [game_settings, section, key, option_values](s32 index, const std::string& title, bool checked) {
+                     [game_settings, section = TinyString(section), key = TinyString(key),
+                      option_values](s32 index, const std::string& title, bool checked) {
                        if (index >= 0)
                        {
                          auto lock = Host::GetSettingsLock();
@@ -2665,8 +2667,8 @@ void FullscreenUI::DrawFolderSetting(SettingsInterface* bsi, const char* title,
   if (MenuButton(title, runtime_var.c_str()))
   {
     OpenFileSelector(title, true,
-                     [game_settings = IsEditingGameSettings(bsi), section = std::string(section),
-                      key = std::string(key)](const std::string& dir) {
+                     [game_settings = IsEditingGameSettings(bsi), section = TinyString(section),
+                      key = TinyString(key)](const std::string& dir) {
                        if (dir.empty())
                          return;