From: Peter Penz <peter.penz19@gmail.com>
Date: Sat, 14 Apr 2007 20:21:30 +0000 (+0000)
Subject: fix possible crash if the base URL is empty
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7cb4232a8cca8366938c9bbcb9c8737ba66fd8f1

fix possible crash if the base URL is empty

svn path=/trunk/KDE/kdebase/apps/; revision=653996
---

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 8c746a253..da8b9bc29 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -87,9 +87,17 @@ void TreeViewSidebarPage::setUrl(const KUrl& url)
 
     m_url = url;
 
+    kDebug() << "-------------- Treeview: url = " << url << endl;
+
     // adjust the root of the tree to the base bookmark
-    KFilePlacesModel *placesModel = DolphinSettings::instance().placesModel();
-    const KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
+    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+    KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
+    if (!baseUrl.isValid()) {
+        // it's possible that no closest item is available and hence an
+        // empty URL is returned
+        baseUrl = url;
+    }
+
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
         m_dirLister->openUrl(baseUrl);