X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/652d08c9242ed51d86dba3b2afda9d3b2e9a9cd7..e53ce0959feaeec8340dfeb92ca410018240b95a:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 24ab43272..380c27692 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -48,21 +48,21 @@ #include #include "dolphin_generalsettings.h" -#include "dolphinmodel.h" #include "dolphinmainwindow.h" -#include "dolphindirlister.h" -#include "dolphinsortfilterproxymodel.h" -#include "draganddrophelper.h" #include "filterbar/filterbar.h" #include "search/dolphinsearchbox.h" #include "settings/dolphinsettings.h" #include "statusbar/dolphinstatusbar.h" -#include "viewproperties.h" #include "views/dolphincolumnview.h" #include "views/dolphindetailsview.h" +#include "views/dolphindirlister.h" +#include "views/dolphinsortfilterproxymodel.h" +#include "views/draganddrophelper.h" #include "views/dolphiniconsview.h" +#include "views/dolphinmodel.h" #include "views/dolphinviewcontroller.h" #include "views/viewmodecontroller.h" +#include "views/viewproperties.h" DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) : QWidget(parent), @@ -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); + } } } }