From: Sergio Villar Senín <svillar@igalia.com>
Date: Wed, 16 Dec 2009 11:00:36 +0000 (+0100)
Subject: Crash when closing viewer window while downloading external images
X-Git-Tag: 3.2.6~2
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=c9ad21d3bc44f1a008a4f2ca23a67af10f8a0b8f

Crash when closing viewer window while downloading external images

Fixes NB#150973
---

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 4e3303e..25843a5 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -3651,7 +3651,9 @@ on_fetch_image_timeout_refresh_view (gpointer userdata)
 
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (userdata);
 	update_progress_hint (MODEST_MSG_VIEW_WINDOW (userdata));
-	if (GTK_WIDGET_DRAWABLE (priv->msg_view)) {
+	/* Note that priv->msg_view is set to NULL when this window is
+	   distroyed */
+	if (priv->msg_view && GTK_WIDGET_DRAWABLE (priv->msg_view)) {
 		gtk_widget_queue_draw (GTK_WIDGET (priv->msg_view));
 	}
 	priv->fetch_image_redraw_handler = 0;