diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2022-02-15 18:03:46 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-02-15 18:08:11 +0100 |
commit | 1e21f5f8729c6987cc9e31184369f7269eea4a35 (patch) | |
tree | 0eee11bee8eab004011316752c0920812ef55aae | |
parent | Merge pull request #7871 from german77/svc2 (diff) | |
download | yuzu-1e21f5f8729c6987cc9e31184369f7269eea4a35.tar yuzu-1e21f5f8729c6987cc9e31184369f7269eea4a35.tar.gz yuzu-1e21f5f8729c6987cc9e31184369f7269eea4a35.tar.bz2 yuzu-1e21f5f8729c6987cc9e31184369f7269eea4a35.tar.lz yuzu-1e21f5f8729c6987cc9e31184369f7269eea4a35.tar.xz yuzu-1e21f5f8729c6987cc9e31184369f7269eea4a35.tar.zst yuzu-1e21f5f8729c6987cc9e31184369f7269eea4a35.zip |
Diffstat (limited to '')
-rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 3 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_touch_from_button.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 9db564663..0aa4ac3e4 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -1332,6 +1332,9 @@ void ConfigureInputPlayer::HandleClick( QPushButton* button, std::size_t button_id, std::function<void(const Common::ParamPackage&)> new_input_setter, InputCommon::Polling::InputType type) { + if (timeout_timer->isActive()) { + return; + } if (button == ui->buttonMotionLeft || button == ui->buttonMotionRight) { button->setText(tr("Shake!")); } else { diff --git a/src/yuzu/configuration/configure_touch_from_button.cpp b/src/yuzu/configuration/configure_touch_from_button.cpp index bde0a08c4..211a00217 100644 --- a/src/yuzu/configuration/configure_touch_from_button.cpp +++ b/src/yuzu/configuration/configure_touch_from_button.cpp @@ -227,6 +227,9 @@ void ConfigureTouchFromButton::RenameMapping() { } void ConfigureTouchFromButton::GetButtonInput(const int row_index, const bool is_new) { + if (timeout_timer->isActive()) { + return; + } binding_list_model->item(row_index, 0)->setText(tr("[press key]")); input_setter = [this, row_index, is_new](const Common::ParamPackage& params, |