Update icon if it couldn't be determined upfront (.desktop file on slow mount)

[dolphin.git] / src / views / versioncontrol / versioncontrolobserver.cpp

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index bbabd2e4e115fd1fa3606bf4e822f1b5024a642b..64bc268679df0c7218f38c1a11ae4b9a7f9e115a 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -90,7 +90,17 @@ KFileItemModel* VersionControlObserver::model() const
 QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) const
 {
     QList<QAction*> actions;
-    if (!m_model) {
+
+    bool hasNullItems = false;
+    foreach (const KFileItem& item, items) {
+        if (item.isNull()) {
+            kWarning() << "Requesting version-control-actions for empty items";
+            hasNullItems = true;
+            break;
+        }
+    }
+
+    if (!m_model || hasNullItems) {
         return actions;
     }
 
@@ -235,7 +245,7 @@ void VersionControlObserver::updateItemStates()
         connect(m_updateItemStatesThread, SIGNAL(finished()),
                 m_updateItemStatesThread, SLOT(deleteLater()));
     }
-    if (m_updateItemStatesThread->isRunning()) {
+    else {
         // An update is currently ongoing. Wait until the thread has finished
         // the update (see slotThreadFinished()).
         m_pendingItemStatesUpdate = true;