[patch] kmail-3.5.6-imap-crash-svn-643329.patch

kmail-3.5.6-imap-crash-svn-643329.patch (text/plain), 1.41 KB, created by Peter Alfredsen (RETIRED) on 2007-03-18 14:56:46 UTC

http://websvn.kde.org/?view=rev&revision=643329

Revision 643329 - (view) (download) (as text) (annotate) - [select for diffs] 
 Modified Fri Mar 16 21:54:53 2007 UTC (36 hours, 51 minutes ago) by coolo 
File length: 77033 byte(s) 
Diff to previous 643194 
fix the recovery path patch - meanwhile we think we know

 Revision 643194 - (view) (download) (as text) (annotate) - [select for diffs] 
 Modified Fri Mar 16 14:40:35 2007 UTC (44 hours, 6 minutes ago) by coolo 
File length: 77029 byte(s) 
Diff to previous 571100 
Till says my patch looks correct for the recovery path
CCBUG: 126715

--- branches/KDE/3.5/kdepim/kmail/kmfolderimap.cpp	2006/08/08 15:14:51	571100
+++ branches/KDE/3.5/kdepim/kmail/kmfolderimap.cpp	2007/03/16 21:54:53	643329
@@ -108,14 +108,15 @@
 //-----------------------------------------------------------------------------
 void KMFolderImap::close(bool aForced)
 {
-  if (mOpenCount <= 0 ) return;
   if (mOpenCount > 0) mOpenCount--;
-  if (mOpenCount > 0 && !aForced) return;
-  if (isSelected() && !aForced) {
+  if (mOpenCount == 0 && isSelected() && !aForced) {
       kdWarning(5006) << "Trying to close the selected folder " << label() <<
-          " - ignoring!" << endl;
+        " - ignoring! " << kdBacktrace() << endl;
+      mOpenCount++;
       return;
   }
+  if (mOpenCount > 0 && !aForced) return;
+
   // FIXME is this still needed?
   if (mAccount)
     mAccount->ignoreJobsForFolder( folder() );