From 6370f094ba951f5397a8a2b34a38bef97050c25f Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Sun, 21 May 2017 14:47:35 +0200
Subject: Qt: Fix default device handling

---
 Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp')

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
-- 
cgit v1.2.3