Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 3b084ac8b486e1ae43ba608742e380232e88b05d..fce99bb587e48c68be6d3bf59baf9a209db4c60f 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -775,7 +775,8 @@ void DolphinMainWindow::togglePanelLockState()
 void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible)
 {
     foreach (DolphinTabPage* tabPage, m_viewTab) {
-        tabPage->setPlacesSelectorVisible(visible);
+        // The Places selector in the location bar should be shown if and only if the Places panel is hidden.
+        tabPage->setPlacesSelectorVisible(!visible);
     }
 }