mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-16 03:00:36 +01:00
Config: Don't copy global WS/NI to game settings
This commit is contained in:
1 parent
e7139ab801
commit
46e30467de
4 files changed
+12
No files matched your search
@@ -299,6 +299,7 @@ void SettingsWindow::onCopyGlobalSettingsClicked()
|
||||
{
|
||||
auto lock = Host::GetSettingsLock();
|
||||
Pcsx2Config::CopyConfiguration(m_sif.get(), *Host::Internal::GetBaseSettingsLayer());
|
||||
Pcsx2Config::ClearInvalidPerGameConfiguration(m_sif.get());
|
||||
}
|
||||
saveAndReloadGameSettings();
|
||||
|
||||
|
||||
@@ -1195,6 +1195,9 @@ struct Pcsx2Config
|
||||
|
||||
/// Clears all core keys from the specified interface.
|
||||
static void ClearConfiguration(SettingsInterface* dest_si);
|
||||
|
||||
/// Removes keys that are not valid for per-game settings.
|
||||
static void ClearInvalidPerGameConfiguration(SettingsInterface* si);
|
||||
};
|
||||
|
||||
extern Pcsx2Config EmuConfig;
|
||||
|
||||
@@ -2770,6 +2770,7 @@ void FullscreenUI::DoCopyGameSettings()
|
||||
return;
|
||||
|
||||
Pcsx2Config::CopyConfiguration(s_game_settings_interface.get(), *GetEditingSettingsInterface(false));
|
||||
Pcsx2Config::ClearInvalidPerGameConfiguration(s_game_settings_interface.get());
|
||||
|
||||
SetSettingsChanged(s_game_settings_interface.get());
|
||||
|
||||
|
||||
@@ -1838,6 +1838,13 @@ void Pcsx2Config::ClearConfiguration(SettingsInterface* dest_si)
|
||||
temp.LoadSaveCore(wrapper);
|
||||
}
|
||||
|
||||
void Pcsx2Config::ClearInvalidPerGameConfiguration(SettingsInterface* si)
|
||||
{
|
||||
// Deprecated in favor of patches.
|
||||
si->DeleteValue("EmuCore", "EnableWideScreenPatches");
|
||||
si->DeleteValue("EmuCore", "EnableNoInterlacingPatches");
|
||||
}
|
||||
|
||||
void EmuFolders::SetAppRoot()
|
||||
{
|
||||
const std::string program_path = FileSystem::GetProgramPath();
|
||||
|
||||
Reference in new issue
Block a user