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

List:       kde-commits
Subject:    branches/KDE/4.1/kdelibs/kfile
From:       David Faure <faure () kde ! org>
Date:       2008-11-29 1:49:58
Message-ID: 1227923398.594533.30044.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 890379 by dfaure:

Backport r890378:
Don't reload the current directory when selecting a file in the file dialog
 (and especially not when that file is auto-selected because the previously current \
file got deleted externally - #173454 crash)


 M  +3 -2      kdiroperator.cpp  


--- branches/KDE/4.1/kdelibs/kfile/kdiroperator.cpp #890378:890379
@@ -901,7 +901,9 @@
 
     if (!Private::isReadable(newurl)) {
         // maybe newurl is a file? check its parent directory
-        newurl.cd(QLatin1String(".."));
+        newurl.setPath(newurl.directory());
+        if (newurl.equals(d->currUrl, KUrl::CompareWithoutTrailingSlash))
+            return; // parent is current dir, nothing to do (fixes #173454, too)
         KIO::UDSEntry entry;
         bool res = KIO::NetAccess::stat(newurl, entry, this);
         KFileItem i(entry, newurl);
@@ -2017,7 +2019,6 @@
 {
     const QModelIndex dirIndex = proxyModel->mapToSource(index);
     KFileItem item = dirModel->itemForIndex(dirIndex);
-    bool selectDir = false;
 
     const Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers();
     if (item.isNull() || (modifiers & Qt::ShiftModifier) || (modifiers & \
Qt::ControlModifier))


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