From b43609404cd645faabf88f0677d09c246f8f731c Mon Sep 17 00:00:00 2001
From: hluk <hluk@email.cz>
Date: Mon, 22 Apr 2013 21:04:25 +0200
Subject: Fix segfault while handling system-wide shortcuts with xcb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8485031edc623f99b4b858d4f777be43f4bc3264
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
---
 src/plugins/platforms/xcb/qxcbconnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index cb80fdfbd3..de3d487c4b 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -422,7 +422,7 @@ break;
     if (QXcbWindow *platformWindow = platformWindowFromId(e->event)) { \
         handled = QWindowSystemInterface::handleNativeEvent(platformWindow->window(), m_nativeInterface->genericEventFilterType(), event, &result); \
         if (!handled) \
-            m_keyboard->handler(m_focusWindow, e); \
+            m_keyboard->handler(m_focusWindow ? m_focusWindow : platformWindow, e); \
     } \
 } \
 break;
-- 
cgit v1.2.3