commit c9974a0796fe2934299f10dc3a879d29c7045859
author Kristian Høgsberg <krh@bitplanet.net> Wed Jul 03 19:24:57 2013 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Wed Jul 03 19:26:04 2013 -0400
tree 0439c1d5229912db27f0108c280e3681d05d4776
parent dfe310512b4ed8f5dd591611b61a5dfd114403b0

shell: Dont set grab cursor if desktop-shell client died

If we don't have a desktop-shell helper client, don't try to send events
to it.

https://bugs.freedesktop.org/show_bug.cgi?id=65961

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index 3b6ac42..bbc3d05 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -335,9 +335,13 @@
 	grab->pointer = pointer;
 
 	weston_pointer_start_grab(pointer, &grab->grab);
-	desktop_shell_send_grab_cursor(shell->child.desktop_shell, cursor);
-	weston_pointer_set_focus(pointer, shell->grab_surface,
-				 wl_fixed_from_int(0), wl_fixed_from_int(0));
+	if (shell->child.desktop_shell) {
+		desktop_shell_send_grab_cursor(shell->child.desktop_shell,
+					       cursor);
+		weston_pointer_set_focus(pointer, shell->grab_surface,
+					 wl_fixed_from_int(0),
+					 wl_fixed_from_int(0));
+	}
 }
 
 static void