mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-05 18:47:12 +00:00
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:
parent
9fee42dfe6
commit
624ca2b320
1 changed files with 6 additions and 4 deletions
|
@ -245,10 +245,12 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
|
||||||
// Restore the URL for the URL navigator. If Dolphin has been
|
// Restore the URL for the URL navigator. If Dolphin has been
|
||||||
// started with a search-URL, the home URL is used as fallback.
|
// started with a search-URL, the home URL is used as fallback.
|
||||||
const KUrl url = m_searchBox->searchPath();
|
const KUrl url = m_searchBox->searchPath();
|
||||||
if (url.isValid() && !url.isEmpty() && !isSearchUrl(url)) {
|
if (url.isValid() && !url.isEmpty()) {
|
||||||
m_urlNavigator->setLocationUrl(url);
|
if (isSearchUrl(url)) {
|
||||||
} else {
|
|
||||||
m_urlNavigator->goHome();
|
m_urlNavigator->goHome();
|
||||||
|
} else {
|
||||||
|
m_urlNavigator->setLocationUrl(url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue