aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-09-21 21:09:22 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-09-21 21:10:44 +0800
commit1fd0976706e25cdfcc9ddf895e4d74d6c849f23a (patch)
tree23d4941d7c53b1e6ef4740268c4ee773072a9f5c /mail
parentdb05afb314394731a97a8ad7bd94ca5ed52d21bc (diff)
downloadgsoc2013-evolution-1fd0976706e25cdfcc9ddf895e4d74d6c849f23a.tar
gsoc2013-evolution-1fd0976706e25cdfcc9ddf895e4d74d6c849f23a.tar.gz
gsoc2013-evolution-1fd0976706e25cdfcc9ddf895e4d74d6c849f23a.tar.bz2
gsoc2013-evolution-1fd0976706e25cdfcc9ddf895e4d74d6c849f23a.tar.lz
gsoc2013-evolution-1fd0976706e25cdfcc9ddf895e4d74d6c849f23a.tar.xz
gsoc2013-evolution-1fd0976706e25cdfcc9ddf895e4d74d6c849f23a.tar.zst
gsoc2013-evolution-1fd0976706e25cdfcc9ddf895e4d74d6c849f23a.zip
Bug 630118 - Endless recursive loop 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 fbbe925b74..595cedf776 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 && m->cancel)
+ if (m != NULL && !camel_operation_cancel_check (m->cancel))
camel_operation_cancel (m->cancel);
g_mutex_unlock (mail_msg_lock);