From 47b5dca40934db0dafeb7c6d6fe8a85578077a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Thu, 7 Jun 2012 18:08:04 -0400
Subject: [PATCH] shell: Don't remove grab listener if surface was destroyed

---
 src/shell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shell.c b/src/shell.c
index 85395c47..8eb98193 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -231,7 +231,8 @@ shell_grab_init(struct shell_grab *grab,
 static void
 shell_grab_finish(struct shell_grab *grab)
 {
-	wl_list_remove(&grab->shsurf_destroy_listener.link);
+	if (grab->shsurf)
+		wl_list_remove(&grab->shsurf_destroy_listener.link);
 }
 
 static void