From b6686b823972e58a02958ef035e540c9701ea99f Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Fri, 21 Oct 2022 00:29:42 +1000 Subject: [PATCH] System: Preserve controller type on core settings reset --- src/core/settings.cpp | 5 +---- src/core/system.cpp | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/settings.cpp b/src/core/settings.cpp index e05e15291..61ee95255 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -511,10 +511,7 @@ void Settings::Save(SettingsInterface& si) const si.SetBoolValue("BIOS", "PatchFastBoot", bios_patch_fast_boot); for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++) - { - si.SetStringValue(TinyString::FromFormat("Controller%u", i + 1u), "Type", - GetControllerTypeName(controller_types[i])); - } + si.SetStringValue(Controller::GetSettingsSection(i).c_str(), "Type", GetControllerTypeName(controller_types[i])); si.SetStringValue("MemoryCards", "Card1Type", GetMemoryCardTypeName(memory_card_types[0])); si.SetStringValue("MemoryCards", "Card2Type", GetMemoryCardTypeName(memory_card_types[1])); diff --git a/src/core/system.cpp b/src/core/system.cpp index 41faa79a6..c16c777d9 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -800,6 +800,10 @@ void System::SetDefaultSettings(SettingsInterface& si) temp.display_show_cpu = g_settings.display_show_cpu; temp.display_show_gpu = g_settings.display_show_gpu; + // keep controller, we reset it elsewhere + for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++) + temp.controller_types[i] = g_settings.controller_types[i]; + temp.Save(si); }