diff options
| author | 2023-03-21 17:52:25 -0700 | |
|---|---|---|
| committer | 2023-03-21 17:52:25 -0700 | |
| commit | dba86ee007c0b7e5cc8aecbcd730fbfaa8ecd0ab (patch) | |
| tree | 7c584dee97283662aa7c76b29e03dff780dd6528 /src | |
| parent | Merge pull request #9970 from bunnei/string-util-view (diff) | |
| parent | config: Fix controller config from resetting (diff) | |
| download | yuzu-dba86ee007c0b7e5cc8aecbcd730fbfaa8ecd0ab.tar.gz yuzu-dba86ee007c0b7e5cc8aecbcd730fbfaa8ecd0ab.tar.xz yuzu-dba86ee007c0b7e5cc8aecbcd730fbfaa8ecd0ab.zip | |
Merge pull request #9965 from german77/thankYouEpicBoy
config: Fix controller config from resetting
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_input.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 1db374d4a..7fce85bca 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp | |||
| @@ -189,6 +189,8 @@ QList<QWidget*> ConfigureInput::GetSubTabs() const { | |||
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | void ConfigureInput::ApplyConfiguration() { | 191 | void ConfigureInput::ApplyConfiguration() { |
| 192 | const bool was_global = Settings::values.players.UsingGlobal(); | ||
| 193 | Settings::values.players.SetGlobal(true); | ||
| 192 | for (auto* controller : player_controllers) { | 194 | for (auto* controller : player_controllers) { |
| 193 | controller->ApplyConfiguration(); | 195 | controller->ApplyConfiguration(); |
| 194 | } | 196 | } |
| @@ -201,6 +203,7 @@ void ConfigureInput::ApplyConfiguration() { | |||
| 201 | 203 | ||
| 202 | Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked()); | 204 | Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked()); |
| 203 | Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked()); | 205 | Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked()); |
| 206 | Settings::values.players.SetGlobal(was_global); | ||
| 204 | } | 207 | } |
| 205 | 208 | ||
| 206 | void ConfigureInput::changeEvent(QEvent* event) { | 209 | void ConfigureInput::changeEvent(QEvent* event) { |