Prevent crashing the compositor when the client wants to unset the cursor.

Change-Id: I40460110e24555aacaef928af32372c32a3291d1
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>

diff --git a/src/compositor/wayland_wrapper/wlinputdevice.cpp b/src/compositor/wayland_wrapper/wlinputdevice.cpp
index c3e977e..41cbc38 100644 (file)
--- a/src/compositor/wayland_wrapper/wlinputdevice.cpp
+++ b/src/compositor/wayland_wrapper/wlinputdevice.cpp
@@ -518,7 +518,7 @@ void InputDevice::pointer_attach(struct wl_client *client,
     InputDevice *inputDevice = wayland_cast<InputDevice>(pointer->seat);
     wl_buffer *buffer = reinterpret_cast<wl_buffer *>(buffer_resource);
 
-    if (wl_buffer_is_shm(buffer)) {
+    if (buffer && wl_buffer_is_shm(buffer)) {
         int stride = wl_shm_buffer_get_stride(buffer);
         uint format = wl_shm_buffer_get_format(buffer);
         (void) format;
@@ -530,6 +530,8 @@ void InputDevice::pointer_attach(struct wl_client *client,
             delete currentCursor;
             currentCursor = img;
         }
+    } else {
+        inputDevice->m_compositor->waylandCompositor()->changeCursor(QImage(), x, y);
     }
 }