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 cffffd70b2586b137315547699f5f42cdd01c1f7..d8f90f3576f8a28cf729c4bf4c33ccf12c58c6bd 100644 (file)
--- 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().