Merged revisions 895059 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim

........
  r895059 | tmcguire | 2008-12-09 23:06:41 +0100 (Tue, 09 Dec 2008) | 6 lines
  
  Backport r895011 by ogoffart from trunk to the 4.1 branch:
  
  Fixes a crash
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=896801

actionscheduler.cpp

@@ -837,7 +837,8 @@ void ActionScheduler::timeOut()
 void ActionScheduler::fetchTimeOut()
 {
   // Note: This is a good place for a debug statement
-  assert( lastJob );
+  if( !lastJob )
+    return;
   // sometimes imap jobs seem to just stall so give up and move on
   disconnect( lastJob, SIGNAL(messageRetrieved( KMMessage* )),
               this, SLOT(messageFetched( KMMessage* )) );

actionscheduler.h

@@ -39,6 +39,7 @@
 
 #include <QList>
 #include <QTime>
+#include <QPointer>
 
 class KMHeaders;
 
@@ -190,7 +191,7 @@ private:
   QTimer *timeOutTimer, *fetchTimeOutTimer;
   QTime timeOutTime, fetchTimeOutTime;
   KMCommand *lastCommand;
-  FolderJob *lastJob;
+  QPointer<FolderJob> lastJob;
 };
 
 }