diff options
| author | 2020-06-03 21:49:31 -0400 | |
|---|---|---|
| committer | 2020-06-03 21:49:31 -0400 | |
| commit | 1b64fae912396ebdd79714eaa6d5d141eb942fa0 (patch) | |
| tree | 33ba8900c0eca6efa49e6879ac28a825ada450cb /src | |
| parent | Merge pull request #4012 from ReinUsesLisp/mipmap-overlaps (diff) | |
| parent | Actually save the input when clearing/resetting to default (diff) | |
| download | yuzu-1b64fae912396ebdd79714eaa6d5d141eb942fa0.tar.gz yuzu-1b64fae912396ebdd79714eaa6d5d141eb942fa0.tar.xz yuzu-1b64fae912396ebdd79714eaa6d5d141eb942fa0.zip | |
Merge pull request #4039 from FearlessTobi/port-5376
Port citra-emu/citra#5376: "Actually save the input when clearing/resetting to default"
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index e4eb5594b..a05fa64ba 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp | |||
| @@ -480,7 +480,9 @@ void ConfigureInputPlayer::RestoreDefaults() { | |||
| 480 | SetAnalogButton(params, analogs_param[analog_id], analog_sub_buttons[sub_button_id]); | 480 | SetAnalogButton(params, analogs_param[analog_id], analog_sub_buttons[sub_button_id]); |
| 481 | } | 481 | } |
| 482 | } | 482 | } |
| 483 | |||
| 483 | UpdateButtonLabels(); | 484 | UpdateButtonLabels(); |
| 485 | ApplyConfiguration(); | ||
| 484 | } | 486 | } |
| 485 | 487 | ||
| 486 | void ConfigureInputPlayer::ClearAll() { | 488 | void ConfigureInputPlayer::ClearAll() { |
| @@ -505,6 +507,7 @@ void ConfigureInputPlayer::ClearAll() { | |||
| 505 | } | 507 | } |
| 506 | 508 | ||
| 507 | UpdateButtonLabels(); | 509 | UpdateButtonLabels(); |
| 510 | ApplyConfiguration(); | ||
| 508 | } | 511 | } |
| 509 | 512 | ||
| 510 | void ConfigureInputPlayer::UpdateButtonLabels() { | 513 | void ConfigureInputPlayer::UpdateButtonLabels() { |