aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/message-list.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index eaf3280b9d..df67b60003 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-27 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #63456.
+
+ * message-list.c (main_folder_changed): noop if the async_event
+ pointer is NULL which can happen during destroy.
+
2004-08-27 JP Rosevear <jpr@novell.com>
* importers/mail-importer.c (import_folders_rec): utf8_filename
diff --git a/mail/message-list.c b/mail/message-list.c
index a321b3290c..4c0fdff1fd 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2689,6 +2689,10 @@ main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
CamelFolderChangeInfo *changes = (CamelFolderChangeInfo *)event_data;
CamelFolder *folder = (CamelFolder *)o;
int i;
+
+ /* may be NULL if we're in the process of being destroyed */
+ if (ml->async_event == NULL)
+ return;
d(printf("folder changed event, changes = %p\n", changes));
if (changes) {