Merge branch 'release/20.12'

This commit is contained in:
Elvis Angelaccio 2020-12-15 23:28:15 +01:00
commit 1b192c67f9
2 changed files with 1 additions and 2 deletions

View file

@ -105,7 +105,6 @@ DolphinContextMenu::Command DolphinContextMenu::open()
} else if (m_context & ItemContext) {
openItemContextMenu();
} else {
Q_ASSERT(m_context == NoContext);
openViewportContextMenu();
}

View file

@ -390,7 +390,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
m_searchBox->setVisible(enabled);
if (enabled) {
const QUrl& locationUrl = m_urlNavigatorConnected->locationUrl();
const QUrl& locationUrl = m_urlNavigator->locationUrl();
m_searchBox->fromSearchUrl(locationUrl);
}