Hovering over blank space in a view while dragging would trigger the FolderExpander...

BUG:182618

Shipped! ;)

svn path=/trunk/KDE/kdebase/apps/; revision=919950

diff --git a/src/folderexpander.cpp b/src/folderexpander.cpp
index 1aaf09ded6e02441ada8fecce36fc501bd7e246f..7fe775944e4fc5ae99db87d27fa68f1fb8b73e1c 100644 (file)
--- a/src/folderexpander.cpp
+++ b/src/folderexpander.cpp
@@ -112,7 +112,9 @@ void FolderExpander::autoExpandTimeout()
     Q_ASSERT(m_dirModel != 0);
     KFileItem itemToExpand = m_dirModel->itemForIndex(indexToExpand);
 
     Q_ASSERT(m_dirModel != 0);
     KFileItem itemToExpand = m_dirModel->itemForIndex(indexToExpand);
 

-    if (itemToExpand.isNull()) {
+    if (itemToExpand.isNull() || itemToExpand == m_dirModel->itemForIndex(QModelIndex())) {
+        // The second clause occurs when we are expanding the folder represented
+        // by the view, which is a case we should ignore (#182618).

         return;
     }
 
         return;
     }