fixed some activation issues in combination with split views

svn path=/trunk/KDE/kdebase/apps/; revision=674980

1 files changed, 6 insertions, 3 deletions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index bb4ff90b7..35c50e88d 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -221,8 +221,9 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
-    if (activeViewContainer() != 0) {
-        activeViewContainer()->setUrl(url);
+    DolphinViewContainer* view = activeViewContainer();
+    if (view != 0) {
+        view->setUrl(url);
         updateEditActions();
         updateViewActions();
         updateGoActions();
@@ -1026,9 +1027,11 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
     updateViewActions();
     updateGoActions();
 
-    setCaption(m_activeViewContainer->url().fileName());
+    const KUrl& url = m_activeViewContainer->url();
+    setCaption(url.fileName());
 
     emit activeViewChanged();
+    emit urlChanged(url);
 }
 
 void DolphinMainWindow::setupActions()