summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Lee <kwangwoong.lee@lge.com>2014-04-01 11:00:13 +0900
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-07 14:40:44 +0200
commit35b4950c045da3d7cb4b684221e2182a2120f555 (patch)
tree21dfd8c4e5b5dec5517d5a6aeb1394d9a365919c
parent78f72b3e0f4c7e04c0e5a128d72b061ed8fdaa65 (diff)
downloadqtwayland-5.3.0.tar.gz
Null check for window on pointer_axisrelease5.3.0
The window is already destroyed and server doesn't get a message yet. Change-Id: Ia9dd0ce891a712d1aa913fcb3313a5fe300788ab Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
-rw-r--r--src/client/qwaylandinputdevice.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 08e29457..29e99364 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -517,6 +517,12 @@ void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, in
QPoint pixelDelta;
QPoint angleDelta;
+ if (window == NULL) {
+ // We destroyed the pointer focus surface, but the server
+ // didn't get the message yet.
+ return;
+ }
+
//normalize value and inverse axis
int valueDelta = wl_fixed_to_int(value) * -12;