diff options
-rw-r--r-- | mail/ChangeLog | 6 | ||||
-rw-r--r-- | mail/mail-display.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4cefc66794..c4cc81862f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2003-05-07 Jeffrey Stedfast <fejj@ximian.com> + + * mail-display.c (mail_display_render): Make sure that we haven't + been destroyed before we start writing to the html engine. Fixes + bug #42333. + 2003-05-07 Not Zed <NotZed@Ximian.com> ** See bug #42456 diff --git a/mail/mail-display.c b/mail/mail-display.c index 5aa1dd1dff..bf8bc41c47 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -1814,6 +1814,11 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll) g_return_if_fail (IS_MAIL_DISPLAY (md)); g_return_if_fail (GTK_IS_HTML (html)); + if (!md->html) { + /* we've been destroyed */ + return; + } + html_stream = gtk_html_begin (html); if (!reset_scroll) { /* This is a hack until there's a clean way to do this. */ |