]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix places text when the URL has a trailing slash
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 1 Sep 2019 20:32:35 +0000 (22:32 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Mon, 2 Sep 2019 18:30:06 +0000 (20:30 +0200)
Summary: QUrl::fileName() returns an empty string if the URL ends with a slash.

Test Plan:
1. Run `dolphin /tmp` from command line
2. Right-click from viewport and click 'Add to Places'

Reviewers: ngraham

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D23654

src/dolphinviewcontainer.cpp

index 585610550573c4c1962edf0276fc76ffdcae57b3..6a8ff914b506d154452aded40568a193e65fb982 100644 (file)
@@ -426,7 +426,7 @@ QString DolphinViewContainer::placesText() const
     if (isSearchModeEnabled()) {
         text = i18n("Search for %1 in %2", m_searchBox->text(), m_searchBox->searchPath().fileName());
     } else {
-        text = url().fileName();
+        text = url().adjusted(QUrl::StripTrailingSlash).fileName();
         if (text.isEmpty()) {
             text = url().host();
         }