Fixed cancellation of SMTPOperation

1 files changed, 8 insertions, 0 deletions

diff --git a/src/async/smtp/MCSMTPOperation.cc b/src/async/smtp/MCSMTPOperation.cc
index e8211a24..0661ce9f 100644
--- a/src/async/smtp/MCSMTPOperation.cc
+++ b/src/async/smtp/MCSMTPOperation.cc
@@ -71,14 +71,22 @@ void SMTPOperation::bodyProgress(SMTPSession * session, unsigned int current, un
     struct progressContext * context = (struct progressContext *) calloc(sizeof(* context), 1);
     context->current = current;
     context->maximum = maximum;
+    
+    retain();
     performMethodOnMainThread((Object::Method) &SMTPOperation::bodyProgressOnMainThread, context);
 }
 
 void SMTPOperation::bodyProgressOnMainThread(void * ctx)
 {
+    if (isCancelled()) {
+        release();
+        return;
+    }
+
     struct progressContext * context = (struct progressContext *) ctx;
     if (mSmtpCallback != NULL) {
         mSmtpCallback->bodyProgress(this, context->current, context->maximum);
     }
     free(context);
+    release();
 }