aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-callbacks.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-callbacks.c')
-rw-r--r--mail/mail-callbacks.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 0800886a7f..8e97ac6963 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1653,8 +1653,9 @@ expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path)
/* Only blank the mail display if the message being
viewed is one of those to be expunged */
+ /* We have a race here if the above hidedeleted hides loaded_uid */
info = camel_folder_get_message_info (fb->folder, fb->loaded_uid);
- if (info->flags & CAMEL_MESSAGE_DELETED)
+ if (info && info->flags & CAMEL_MESSAGE_DELETED)
mail_display_set_message (fb->mail_display, NULL);
fb->expunging = fb->folder;