diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp index c38391fc60..8ba9de721a 100644 --- a/pcsx2-qt/QtHost.cpp +++ b/pcsx2-qt/QtHost.cpp @@ -251,7 +251,8 @@ void QtHost::SetDefaultConfig() } EmuFolders::Save(si); - PAD::SetDefaultConfig(si); + PAD::SetDefaultControllerConfig(si); + PAD::SetDefaultHotkeyConfig(si); } void QtHost::SetBaseBoolSettingValue(const char* section, const char* key, bool value) diff --git a/pcsx2-qt/Settings/ControllerSettingsDialog.cpp b/pcsx2-qt/Settings/ControllerSettingsDialog.cpp index d2dd07f697..72761494d3 100644 --- a/pcsx2-qt/Settings/ControllerSettingsDialog.cpp +++ b/pcsx2-qt/Settings/ControllerSettingsDialog.cpp @@ -206,7 +206,8 @@ void ControllerSettingsDialog::onRestoreDefaultsClicked() // actually restore it { auto lock = Host::GetSettingsLock(); - PAD::SetDefaultConfig(*Host::Internal::GetBaseSettingsLayer()); + PAD::SetDefaultControllerConfig(*Host::Internal::GetBaseSettingsLayer()); + PAD::SetDefaultHotkeyConfig(*Host::Internal::GetBaseSettingsLayer()); QtHost::QueueSettingsSave(); } diff --git a/pcsx2/Frontend/FullscreenUI.cpp b/pcsx2/Frontend/FullscreenUI.cpp index fb3e4f78f4..9c6fdfb164 100644 --- a/pcsx2/Frontend/FullscreenUI.cpp +++ b/pcsx2/Frontend/FullscreenUI.cpp @@ -2918,7 +2918,8 @@ void FullscreenUI::ResetControllerSettings() { SettingsInterface* dsi = GetEditingSettingsInterface(); - PAD::SetDefaultConfig(*dsi); + PAD::SetDefaultControllerConfig(*dsi); + PAD::SetDefaultHotkeyConfig(*dsi); ShowToast(std::string(), "Controller settings reset to default."); } diff --git a/pcsx2/PAD/Host/PAD.cpp b/pcsx2/PAD/Host/PAD.cpp index ee9ee1aa22..038aaeca36 100644 --- a/pcsx2/PAD/Host/PAD.cpp +++ b/pcsx2/PAD/Host/PAD.cpp @@ -290,7 +290,7 @@ const char* PAD::GetDefaultPadType(u32 pad) return (pad == 0) ? "DualShock2" : "None"; } -void PAD::SetDefaultConfig(SettingsInterface& si) +void PAD::SetDefaultControllerConfig(SettingsInterface& si) { si.ClearSection("InputSources"); si.ClearSection("Hotkeys"); @@ -324,7 +324,10 @@ void PAD::SetDefaultConfig(SettingsInterface& si) // PCSX2 Controller Settings - Controller 1 / Controller 2 / ... // Use the automapper to set this up. MapController(si, 0, InputManager::GetGenericBindingMapping("Keyboard")); +} +void PAD::SetDefaultHotkeyConfig(SettingsInterface& si) +{ // PCSX2 Controller Settings - Hotkeys // PCSX2 Controller Settings - Hotkeys - General diff --git a/pcsx2/PAD/Host/PAD.h b/pcsx2/PAD/Host/PAD.h index b1d64123ee..93f231afc6 100644 --- a/pcsx2/PAD/Host/PAD.h +++ b/pcsx2/PAD/Host/PAD.h @@ -137,7 +137,8 @@ namespace PAD void LoadConfig(const SettingsInterface& si); /// Restores default configuration. - void SetDefaultConfig(SettingsInterface& si); + void SetDefaultControllerConfig(SettingsInterface& si); + void SetDefaultHotkeyConfig(SettingsInterface& si); /// Clears all bindings for a given port. void ClearPortBindings(SettingsInterface& si, u32 port);