From 07cc926775e063f3546f0104f4b49016060ac56b Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Wed, 19 Aug 2020 23:46:04 +1000 Subject: [PATCH] SDL: Fix mismatch between saved and running settings --- src/duckstation-sdl/sdl_host_interface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/duckstation-sdl/sdl_host_interface.cpp b/src/duckstation-sdl/sdl_host_interface.cpp index 762692a3a..85c223461 100644 --- a/src/duckstation-sdl/sdl_host_interface.cpp +++ b/src/duckstation-sdl/sdl_host_interface.cpp @@ -454,8 +454,8 @@ void SDLHostInterface::LoadSettings() { // Settings need to be loaded prior to creating the window for OpenGL bits. m_settings_interface = std::make_unique(GetSettingsFileName()); + m_settings_copy.Load(*m_settings_interface); CommonHostInterface::LoadSettings(*m_settings_interface.get()); - m_settings_copy = g_settings; } void SDLHostInterface::ReportError(const char* message) @@ -807,7 +807,7 @@ void SDLHostInterface::DrawQuickSettingsMenu() if (ImGui::BeginMenu("CPU Execution Mode")) { - const CPUExecutionMode current = g_settings.cpu_execution_mode; + const CPUExecutionMode current = m_settings_copy.cpu_execution_mode; for (u32 i = 0; i < static_cast(CPUExecutionMode::Count); i++) { if (ImGui::MenuItem(Settings::GetCPUExecutionModeDisplayName(static_cast(i)), nullptr,