From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sat, 27 Jun 2009 10:42:47 +0000 (+0000)
Subject: Swap two lines in DolphinViewContainer::setUrl. Up to now, the "if
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/fc77061ec0163e481cb81ecdb1ff03a93758c66d?ds=inline

Swap two lines in DolphinViewContainer::setUrl. Up to now, the "if
(...)" check was more or less equivalent to "if (false)" here ;-) I've
verified that the "Create New..." menu is still enabled correctly when
switching columns in Columns view, which is what the "if" check
was added for in the first place.

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

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index cffffd70b..d8f90f357 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -188,8 +188,8 @@ DolphinViewContainer::~DolphinViewContainer()
 
 void DolphinViewContainer::setUrl(const KUrl& newUrl)
 {
-    m_urlNavigator->setUrl(newUrl);
     if (newUrl != m_urlNavigator->url()) {
+        m_urlNavigator->setUrl(newUrl);
         // Temporary disable the 'File'->'Create New...' menu until
         // the write permissions can be checked in a fast way at
         // DolphinViewContainer::slotDirListerCompleted().