Merge pull request #9965 from german77/thankYouEpicBoy

config: Fix controller config from resetting
This commit is contained in:
bunnei 2023-03-21 17:52:25 -07:00 committed by GitHub
commit dba86ee007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -189,6 +189,8 @@ QList<QWidget*> ConfigureInput::GetSubTabs() const {
} }
void ConfigureInput::ApplyConfiguration() { void ConfigureInput::ApplyConfiguration() {
const bool was_global = Settings::values.players.UsingGlobal();
Settings::values.players.SetGlobal(true);
for (auto* controller : player_controllers) { for (auto* controller : player_controllers) {
controller->ApplyConfiguration(); controller->ApplyConfiguration();
} }
@ -201,6 +203,7 @@ void ConfigureInput::ApplyConfiguration() {
Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked()); Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked()); Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
Settings::values.players.SetGlobal(was_global);
} }
void ConfigureInput::changeEvent(QEvent* event) { void ConfigureInput::changeEvent(QEvent* event) {