summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2012-02-13 20:38:44 +0100
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-02-13 21:25:32 +0100
commitb61d1417dc81761276b3bac44775141b3551ef4e (patch)
tree8c303c7f7bd3a76f38932fa4a92e834286a3c3d8
parent9b657f70101951239b6af94afedcedffe65e5f10 (diff)
Prevent occasional crash in qwaylandinputdevice.cpp
Change-Id: I86559add9925dad6aef530433dd92066f1708757 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
-rw-r--r--src/plugins/platforms/wayland/qwaylandinputdevice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index ee4ffc1c2..88b1bda06 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -268,7 +268,7 @@ void QWaylandInputDevice::inputHandleKey(void *data,
QEvent::Type type;
char s[2];
- if (window == NULL) {
+ if (window == NULL || !inputDevice->mXkb) {
/* We destroyed the keyboard focus surface, but the server
* didn't get the message yet. */
return;