X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ff243261742ecd70fb9e417614e757b5956c04aa..da76a0722cf0db07e90aa257bbdba717cdb68817:/src/views/versioncontrol/versioncontrolobserver.cpp

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 20b059035..ac4709069 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -146,8 +146,8 @@ void VersionControlObserver::verifyDirectory()
         return;
     }
 
-    const KUrl versionControlUrl = m_model->rootItem().url();
-    if (!versionControlUrl.isLocalFile()) {
+    const KFileItem rootItem = m_model->rootItem();
+    if (rootItem.isNull() || !rootItem.url().isLocalFile()) {
         return;
     }
 
@@ -155,7 +155,7 @@ void VersionControlObserver::verifyDirectory()
         m_plugin->disconnect(this);
     }
 
-    m_plugin = searchPlugin(versionControlUrl);
+    m_plugin = searchPlugin(rootItem.url());
     if (m_plugin) {
         KVersionControlPlugin2* pluginV2 = qobject_cast<KVersionControlPlugin2*>(m_plugin);
         if (pluginV2) {
@@ -195,7 +195,7 @@ void VersionControlObserver::slotThreadFinished()
     UpdateItemStatesThread* thread = m_updateItemStatesThread;
     m_updateItemStatesThread = 0; // The thread deletes itself automatically (see updateItemStates())
 
-    if (!m_plugin) {
+    if (!m_plugin || !thread) {
         return;
     }