Fixed IMAP disconnect cancellation

1 files changed, 8 insertions, 2 deletions

diff --git a/src/async/imap/MCIMAPMultiDisconnectOperation.cc b/src/async/imap/MCIMAPMultiDisconnectOperation.cc
index c33eb1bb..249df781 100644
--- a/src/async/imap/MCIMAPMultiDisconnectOperation.cc
+++ b/src/async/imap/MCIMAPMultiDisconnectOperation.cc
@@ -29,10 +29,13 @@ void IMAPMultiDisconnectOperation::addOperation(IMAPOperation * op)
 void IMAPMultiDisconnectOperation::start()
 {
     if (_operations->count() == 0) {
-        callback()->operationFinished(this);
+        if (callback() != NULL) {
+            callback()->operationFinished(this);
+        }
         return;
     }
     
+    retain();
     mc_foreacharray(IMAPOperation, op, _operations) {
         op->setCallbackDispatchQueue(this->callbackDispatchQueue());
         op->setCallback(this);
@@ -44,7 +47,10 @@ void IMAPMultiDisconnectOperation::operationFinished(Operation * op)
 {
     _count ++;
     if (_count == _operations->count()) {
-        callback()->operationFinished(this);
+        if (callback() != NULL) {
+            callback()->operationFinished(this);
+        }
+        release();
     }
 }