From: Peter Penz <peter.penz19@gmail.com>
Date: Tue, 17 Aug 2010 19:58:47 +0000 (+0000)
Subject: Fix triggering of an assertion, if a new tab is opened. Thanks to Frank Reininghaus... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/624ca2b320a79ac668f5562cad0f21c32ab9a83e

Fix triggering of an assertion, if a new tab is opened. Thanks to Frank Reininghaus for the detailed analyses!

BUG: 246747
FIXED-IN: 4.6.0


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

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 2fb7565f1..380c27692 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -245,10 +245,12 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
         // Restore the URL for the URL navigator. If Dolphin has been
         // started with a search-URL, the home URL is used as fallback.
         const KUrl url = m_searchBox->searchPath();
-        if (url.isValid() && !url.isEmpty() && !isSearchUrl(url)) {
-            m_urlNavigator->setLocationUrl(url);
-        } else {
-            m_urlNavigator->goHome();
+        if (url.isValid() && !url.isEmpty()) {
+            if (isSearchUrl(url)) {
+                m_urlNavigator->goHome();
+            } else {
+                m_urlNavigator->setLocationUrl(url);
+            }
         }
     }
 }