[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kmail
From:       Till Adam <adam () kde ! org>
Date:       2005-07-29 12:22:25
Message-ID: 1122639745.624064.2284.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439961 by tilladam:

Crash guards, as inspired by a patch by
Gustavo Pichorim Boiko <gustavo.boiko@kdemail.net>


 M  +10 -5     kmsender.cpp  


--- branches/KDE/3.5/kdepim/kmail/kmsender.cpp #439960:439961
@@ -561,8 +561,10 @@
   extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc );
   const QCString message = mCurrentMsg->asSendableString();
   if ( sender.isEmpty() || !mSendProc->send( sender, to, cc, bcc, message ) ) {
-    mCurrentMsg->setTransferInProgress( false );
-    mOutboxFolder->unGetMsg( mFailedMessages );
+    if ( mCurrentMsg )
+      mCurrentMsg->setTransferInProgress( false );
+    if ( mOutboxFolder )
+      mOutboxFolder->unGetMsg( mFailedMessages );
     mCurrentMsg = 0;
     cleanup();
     setStatusMsg(i18n("Failed to send (some) queued messages."));
@@ -638,7 +640,8 @@
     // sending of message aborted
     if ( mCurrentMsg ) {
       mCurrentMsg->setTransferInProgress( false );
-      mOutboxFolder->unGetMsg( mFailedMessages );
+      if ( mOutboxFolder )
+        mOutboxFolder->unGetMsg( mFailedMessages );
       mCurrentMsg = 0;
     }
     msg = i18n("Sending aborted:\n%1\n"
@@ -652,8 +655,10 @@
     setStatusMsg( i18n( "Sending aborted." ) );
   } else {
     if (!mSendProc->sendOk()) {
-      mCurrentMsg->setTransferInProgress( false );
-      mOutboxFolder->unGetMsg( mFailedMessages );
+      if ( mCurrentMsg )
+        mCurrentMsg->setTransferInProgress( false );
+      if ( mOutboxFolder )
+        mOutboxFolder->unGetMsg( mFailedMessages );
       mCurrentMsg = 0;
       mFailedMessages++;
       // Sending of message failed.
[prev in list] [next in list] [prev in thread] [next in thread]