summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2017-05-21 14:47:35 +0200
committerspycrab <spycrab@users.noreply.github.com>2017-05-21 14:47:35 +0200
commit6370f094ba951f5397a8a2b34a38bef97050c25f (patch)
treed1d727dc2405c60d5ada4cb06df1f9a9abbc5153 /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
parent1c9d11c0e9a6559d4bb449e7a484f5de91271dbb (diff)
Qt: Fix default device handling
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
index f4bfc00f80..12c1b939fc 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
@@ -54,7 +54,7 @@ GetExpressionForControl(const QString& control_name,
void MappingButton::OnButtonPressed()
{
- if (m_block)
+ if (m_block || m_parent->GetDevice() == nullptr)
return;
// Make sure that we don't block event handling