From f0c3f6e42a783b607e3acbe77e0ff82c4f2b7187 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 9 Sep 2015 02:00:52 -0700 Subject: [PATCH] Qt: Fix shortcuts being updated improperly when changing input type (fixes #102) --- src/platform/qt/ShortcutView.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/platform/qt/ShortcutView.cpp b/src/platform/qt/ShortcutView.cpp index d1f694da5..00d4385a6 100644 --- a/src/platform/qt/ShortcutView.cpp +++ b/src/platform/qt/ShortcutView.cpp @@ -22,10 +22,14 @@ ShortcutView::ShortcutView(QWidget* parent) m_ui.keyEdit->setValueKey(0); connect(m_ui.gamepadButton, &QAbstractButton::pressed, [this]() { + bool signalsBlocked = m_ui.keyEdit->blockSignals(true); m_ui.keyEdit->setValueButton(-1); + m_ui.keyEdit->blockSignals(signalsBlocked); }); connect(m_ui.keyboardButton, &QAbstractButton::pressed, [this]() { + bool signalsBlocked = m_ui.keyEdit->blockSignals(true); m_ui.keyEdit->setValueKey(0); + m_ui.keyEdit->blockSignals(signalsBlocked); }); connect(m_ui.keyEdit, SIGNAL(valueChanged(int)), this, SLOT(updateButton(int))); connect(m_ui.keyEdit, SIGNAL(axisChanged(int, int)), this, SLOT(updateAxis(int, int)));