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

List:       kde-commits
Subject:    kdelibs/kio/kfile
From:       David Faure <faure () kde ! org>
Date:       2005-02-23 21:03:20
Message-ID: 20050223210320.2A0F6EA9D () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Fixed crash reported by Lukas Tinkl:
Open KFileDialog, activate big icons and previews in the RMB, close. Delete a file
from that dir in a terminal. Reopen KFileDialog -> crash.

Reason: PreviewJob was created with the cached items from KDirListerCache,
which would then start an update, and delete the removed items -> crash in
PreviewJob since it wasn't told about it.


  M +2 -3      kfiledialog.cpp   1.390
  M +6 -3      kfileiconview.cpp   1.100


--- kdelibs/kio/kfile/kfiledialog.cpp  #1.389:1.390
@@ -57,5 +57,4 @@
 #include <kio/job.h>
 #include <kio/netaccess.h>
-#include <kio/previewjob.h>
 #include <kio/scheduler.h>
 #include <klocale.h>

--- kdelibs/kio/kfile/kfileiconview.cpp  #1.99:1.100
@@ -469,4 +469,7 @@ void KFileIconView::removeItem( const KF
         return;
 
+    if ( d->job )
+        d->job->removeItem( i );
+
     KFileIconViewItem *item = viewItem( i );
     m_resolver->m_lstPendingMimeIconItems.remove( item );


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