summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2017-03-02 12:29:28 +0100
committerwwylele <wwylele@gmail.com>2017-03-02 12:29:28 +0100
commitb5faa681206e2d82248293591f010f7aea8b99fe (patch)
treea02f3e28dbcd446d8afe60c84e2bae05a1615f94 /src/citra_qt
parentcitra: update default ini with new input system (diff)
downloadyuzu-b5faa681206e2d82248293591f010f7aea8b99fe.tar
yuzu-b5faa681206e2d82248293591f010f7aea8b99fe.tar.gz
yuzu-b5faa681206e2d82248293591f010f7aea8b99fe.tar.bz2
yuzu-b5faa681206e2d82248293591f010f7aea8b99fe.tar.lz
yuzu-b5faa681206e2d82248293591f010f7aea8b99fe.tar.xz
yuzu-b5faa681206e2d82248293591f010f7aea8b99fe.tar.zst
yuzu-b5faa681206e2d82248293591f010f7aea8b99fe.zip
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/configure_input.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/citra_qt/configure_input.cpp b/src/citra_qt/configure_input.cpp
index 4a14757ad..b59713e2c 100644
--- a/src/citra_qt/configure_input.cpp
+++ b/src/citra_qt/configure_input.cpp
@@ -79,11 +79,14 @@ ConfigureInput::ConfigureInput(QWidget* parent)
for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) {
for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) {
- connect(analog_map[analog_id][sub_button_id], &QPushButton::released, [=]() {
- handleClick(analog_map[analog_id][sub_button_id], [=](int key) {
- SetAnalogKey(key, analogs_param[analog_id], analog_sub_buttons[sub_button_id]);
+ if (analog_map[analog_id][sub_button_id] != nullptr) {
+ connect(analog_map[analog_id][sub_button_id], &QPushButton::released, [=]() {
+ handleClick(analog_map[analog_id][sub_button_id], [=](int key) {
+ SetAnalogKey(key, analogs_param[analog_id],
+ analog_sub_buttons[sub_button_id]);
+ });
});
- });
+ }
}
}