summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhluk <hluk@email.cz>2013-04-22 21:04:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-24 18:30:33 +0200
commitb43609404cd645faabf88f0677d09c246f8f731c (patch)
tree93afc8fcdff6a9070bb1947cbe1eef66f4876da7 /src
parent1c1727504708212c9469bc054103580c016315db (diff)
Fix segfault while handling system-wide shortcuts with xcb
Change-Id: I8485031edc623f99b4b858d4f777be43f4bc3264 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp2
1 files changed, 1 insertions, 1 deletions
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;