diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphintabpage.cpp | 12 | ||||
| -rw-r--r-- | src/views/dolphinview.cpp | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index 8e06bbb69..35c244c9e 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -470,17 +470,7 @@ void DolphinTabPage::slotViewActivated() void DolphinTabPage::slotViewUrlRedirection(const QUrl &oldUrl, const QUrl &newUrl) { - // Make sure the url of the view is updated. BUG:496414 - if (splitViewEnabled()) { - if (primaryViewContainer()->view()->url() == oldUrl) { - primaryViewContainer()->view()->setUrl(newUrl); - } - if (secondaryViewContainer()->view()->url() == oldUrl) { - secondaryViewContainer()->view()->setUrl(newUrl); - } - } else { - activeViewContainer()->view()->setUrl(newUrl); - } + Q_UNUSED(oldUrl) Q_EMIT activeViewUrlChanged(newUrl); } diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index f48767e11..e8772fdad 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1786,8 +1786,11 @@ void DolphinView::observeCreatedItem(const QUrl &url) void DolphinView::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUrl) { if (oldUrl.matches(url(), QUrl::StripTrailingSlash)) { - Q_EMIT redirection(oldUrl, newUrl); + // Update the view's URL before emitting signals. m_url = newUrl; // #186947 + Q_EMIT urlChanged(m_url); + + Q_EMIT redirection(oldUrl, newUrl); } } |