summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid <25727384+ogniK5377@users.noreply.github.com>2019-09-05 01:53:44 +0200
committerGitHub <noreply@github.com>2019-09-05 01:53:44 +0200
commita956d0b0eb77b92278f1ed0e421f4dd0d702033d (patch)
tree69b3d88196642c43879f15faaebbc87167943cd0
parentMerge pull request #2834 from Morph1984/audrenu_QueryAudioDeviceInputEvent (diff)
parentAdd cancel option to analog stick configuration (diff)
downloadyuzu-a956d0b0eb77b92278f1ed0e421f4dd0d702033d.tar
yuzu-a956d0b0eb77b92278f1ed0e421f4dd0d702033d.tar.gz
yuzu-a956d0b0eb77b92278f1ed0e421f4dd0d702033d.tar.bz2
yuzu-a956d0b0eb77b92278f1ed0e421f4dd0d702033d.tar.lz
yuzu-a956d0b0eb77b92278f1ed0e421f4dd0d702033d.tar.xz
yuzu-a956d0b0eb77b92278f1ed0e421f4dd0d702033d.tar.zst
yuzu-a956d0b0eb77b92278f1ed0e421f4dd0d702033d.zip
-rw-r--r--src/yuzu/configuration/configure_input_player.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index 7b70f307c..a968cfb5d 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -301,13 +301,16 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
});
}
connect(analog_map_stick[analog_id], &QPushButton::clicked, [=] {
- QMessageBox::information(this, tr("Information"),
- tr("After pressing OK, first move your joystick horizontally, "
- "and then vertically."));
- HandleClick(
- analog_map_stick[analog_id],
- [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; },
- InputCommon::Polling::DeviceType::Analog);
+ if (QMessageBox::information(
+ this, tr("Information"),
+ tr("After pressing OK, first move your joystick horizontally, "
+ "and then vertically."),
+ QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
+ HandleClick(
+ analog_map_stick[analog_id],
+ [=](const Common::ParamPackage& params) { analogs_param[analog_id] = params; },
+ InputCommon::Polling::DeviceType::Analog);
+ }
});
}