history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-20 18:05:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: Fix mismatch between saved and running settings

Browse Source
This commit is contained in:
Connor McLaughlin 2020-08-19 23:46:04 +10:00
parent daa72aba10
commit 07cc926775
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/duckstation-sdl/sdl_host_interface.cpp
View File

@ -454,8 +454,8 @@ void SDLHostInterface::LoadSettings()
{ {
// Settings need to be loaded prior to creating the window for OpenGL bits. // Settings need to be loaded prior to creating the window for OpenGL bits.
m_settings_interface = std::make_unique<INISettingsInterface>(GetSettingsFileName()); m_settings_interface = std::make_unique<INISettingsInterface>(GetSettingsFileName());
m_settings_copy.Load(*m_settings_interface);
CommonHostInterface::LoadSettings(*m_settings_interface.get()); CommonHostInterface::LoadSettings(*m_settings_interface.get());
m_settings_copy = g_settings;
} }
void SDLHostInterface::ReportError(const char* message) void SDLHostInterface::ReportError(const char* message)
@ -807,7 +807,7 @@ void SDLHostInterface::DrawQuickSettingsMenu()
if (ImGui::BeginMenu("CPU Execution Mode")) 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<u32>(CPUExecutionMode::Count); i++) for (u32 i = 0; i < static_cast<u32>(CPUExecutionMode::Count); i++)
{ {
if (ImGui::MenuItem(Settings::GetCPUExecutionModeDisplayName(static_cast<CPUExecutionMode>(i)), nullptr, if (ImGui::MenuItem(Settings::GetCPUExecutionModeDisplayName(static_cast<CPUExecutionMode>(i)), nullptr,