mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
temporary fix: prevent crash due to a wrong root URL; TODO: fix the real root cause of this crash
svn path=/trunk/KDE/kdebase/apps/; revision=716416
This commit is contained in:
parent
4a50a536b6
commit
4832bd7fbd
|
@ -423,15 +423,20 @@ void DolphinView::setUrl(const KUrl& url)
|
|||
const KUrl oldRootUrl = rootUrl();
|
||||
m_controller->setUrl(url); // emits urlChanged, which we forward
|
||||
|
||||
bool useUrlProperties = true;
|
||||
const bool restoreColumnView = !isColumnViewActive()
|
||||
&& m_rootUrl.isParentOf(url)
|
||||
&& (m_rootUrl != url);
|
||||
if (restoreColumnView) {
|
||||
applyViewProperties(m_rootUrl);
|
||||
if (itemView() == m_columnView) {
|
||||
startDirLister(m_rootUrl);
|
||||
Q_ASSERT(itemView() == m_columnView);
|
||||
m_columnView->showColumn(url);
|
||||
} else {
|
||||
useUrlProperties = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (useUrlProperties) {
|
||||
applyViewProperties(url);
|
||||
startDirLister(url);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue