From c95d7fae79a309ed7f2df393fa20257cb20d54a8 Mon Sep 17 00:00:00 2001 From: Anthony Fieroni Date: Sat, 12 Dec 2020 12:36:23 +0200 Subject: [PATCH 1/2] Fix access url navigator while creating new tab in filename search view BUG: 429628 BUG: 430434 Signed-off-by: Anthony Fieroni --- src/dolphinviewcontainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 7260d2c4c0..8dd309314c 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -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); } From aeea98837d22d018b4d738d0d64297f856e3955c Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Tue, 15 Dec 2020 22:56:06 +0100 Subject: [PATCH 2/2] DolphinContextMenu: drop wrong assert `m_context` can also be `SearchContext` or `TimelineContext`, so this assert has been wrong since 8b0c12a59ccb23f. --- src/dolphincontextmenu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 283f525650..91e9d8238d 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -103,7 +103,6 @@ DolphinContextMenu::Command DolphinContextMenu::open() } else if (m_context & ItemContext) { openItemContextMenu(); } else { - Q_ASSERT(m_context == NoContext); openViewportContextMenu(); }