Fix triggering of an assertion, if a new tab is opened. Thanks to Frank Reininghaus for the detailed analyses!

BUG: 246747
FIXED-IN: 4.6.0


svn path=/trunk/KDE/kdebase/apps/; revision=1164862
This commit is contained in:
Peter Penz 2010-08-17 19:58:47 +00:00
parent 9fee42dfe6
commit 624ca2b320

View file

@ -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);
}
}
}
}