aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-mt.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-mt.c')
-rw-r--r--mail/mail-mt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 2fa9969cc0..99d691b1ca 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -508,7 +508,7 @@ mail_msg_idle_cb (void)
static void
mail_msg_proxy (MailMsg *msg)
{
- if (msg->info->desc != NULL) {
+ if (msg->info->desc != NULL && msg->cancel) {
gchar *text = msg->info->desc (msg);
camel_operation_register (msg->cancel);
camel_operation_start (msg->cancel, "%s", text);
@@ -521,7 +521,7 @@ mail_msg_proxy (MailMsg *msg)
mail_disable_stop ();
}
- if (msg->info->desc != NULL) {
+ if (msg->info->desc != NULL && msg->cancel) {
camel_operation_end (msg->cancel);
camel_operation_unregister (msg->cancel);
MAIL_MT_LOCK (mail_msg_lock);