From 85195524014976e855a8ef0593456c56423c6e7a Mon Sep 17 00:00:00 2001
From: buliabyak <buliabyak@users.sourceforge.net>
Date: Mon, 13 Nov 2006 08:50:14 +0000
Subject: [PATCH] fix another crash on exit caused by trying to do stuff when
 canvas is no more

---
 src/display/sp-canvas.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 71e4d955d..3247a3e1f 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1276,6 +1276,9 @@ pick_current_item (SPCanvas *canvas, GdkEvent *event)
     int button_down = 0;
     double x, y;
 
+    if (!canvas->root) // canvas may have already be destroyed by closing desktop durring interrupted display!
+        return FALSE;
+
     int retval = FALSE;
 
     if (canvas->gen_all_enter_events == false) {
-- 
2.30.2