aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-09-21 21:34:25 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-09-21 21:34:25 +0800
commitbbb5b172dab0d9ba85cd48670ece04733b28c758 (patch)
tree2082a5b4c79a0fe7968a4621d9595e119ef22f96 /mail
parent1fd0976706e25cdfcc9ddf895e4d74d6c849f23a (diff)
downloadgsoc2013-evolution-bbb5b172dab0d9ba85cd48670ece04733b28c758.tar
gsoc2013-evolution-bbb5b172dab0d9ba85cd48670ece04733b28c758.tar.gz
gsoc2013-evolution-bbb5b172dab0d9ba85cd48670ece04733b28c758.tar.bz2
gsoc2013-evolution-bbb5b172dab0d9ba85cd48670ece04733b28c758.tar.lz
gsoc2013-evolution-bbb5b172dab0d9ba85cd48670ece04733b28c758.tar.xz
gsoc2013-evolution-bbb5b172dab0d9ba85cd48670ece04733b28c758.tar.zst
gsoc2013-evolution-bbb5b172dab0d9ba85cd48670ece04733b28c758.zip
Check for m->cancel != NULL in mail_msg_cancel().
Diffstat (limited to 'mail')
-rw-r--r--mail/mail-mt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 595cedf776..e17d3c2daf 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -303,7 +303,7 @@ void mail_msg_cancel (guint msgid)
m = g_hash_table_lookup (mail_msg_active_table, GINT_TO_POINTER (msgid));
- if (m != NULL && !camel_operation_cancel_check (m->cancel))
+ if (m != NULL && m->cancel != NULL && !camel_operation_cancel_check (m->cancel))
camel_operation_cancel (m->cancel);
g_mutex_unlock (mail_msg_lock);