ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

System: Only check controller changes when valid

This commit is contained in:
Stenzek 2024-10-14 12:46:54 +10:00
parent 4a57ccc3e8
commit 11c212260c
No known key found for this signature in database
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/system.cpp
View File

@ -4417,6 +4417,21 @@ void System::CheckForSettingsChanges(const Settings& old_settings)
if (g_settings.cdrom_readahead_sectors != old_settings.cdrom_readahead_sectors) if (g_settings.cdrom_readahead_sectors != old_settings.cdrom_readahead_sectors)
CDROM::SetReadaheadSectors(g_settings.cdrom_readahead_sectors); CDROM::SetReadaheadSectors(g_settings.cdrom_readahead_sectors);
bool controllers_updated = false;
for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++)
{
if (g_settings.controller_types[i] != old_settings.controller_types[i])
{
UpdateControllers();
ResetControllers();
controllers_updated = true;
break;
}
}
if (!controllers_updated)
UpdateControllerSettings();
if (g_settings.memory_card_types != old_settings.memory_card_types || if (g_settings.memory_card_types != old_settings.memory_card_types ||
g_settings.memory_card_paths != old_settings.memory_card_paths || g_settings.memory_card_paths != old_settings.memory_card_paths ||
(g_settings.memory_card_use_playlist_title != old_settings.memory_card_use_playlist_title)) (g_settings.memory_card_use_playlist_title != old_settings.memory_card_use_playlist_title))
@ -4487,23 +4502,6 @@ void System::CheckForSettingsChanges(const Settings& old_settings)
ImGuiManager::SetGlobalScale(g_settings.display_osd_scale / 100.0f); ImGuiManager::SetGlobalScale(g_settings.display_osd_scale / 100.0f);
} }
bool controllers_updated = false;
for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++)
{
if (g_settings.controller_types[i] != old_settings.controller_types[i])
{
if (IsValid() && !controllers_updated)
{
UpdateControllers();
ResetControllers();
controllers_updated = true;
}
}
}
if (IsValid() && !controllers_updated)
UpdateControllerSettings();
if (g_settings.multitap_mode != old_settings.multitap_mode) if (g_settings.multitap_mode != old_settings.multitap_mode)
UpdateMultitaps(); UpdateMultitaps();