Fix for crash which was introduced by commit

[dolphin.git] / src / dolphintabwidget.cpp

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 7a486942103c2db0a5571668c0e96228653acf5a..a0c9b9d8198269bcf9c560106332cdf0dd9b45a7 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -184,7 +184,7 @@ void DolphinTabWidget::openFiles(const QList<QUrl>& files)
     // directories are shown inside one tab (see openDirectories()).
     QList<QUrl> dirs;
     foreach (const QUrl& url, files) {
     // directories are shown inside one tab (see openDirectories()).
     QList<QUrl> dirs;
     foreach (const QUrl& url, files) {

-        const QUrl dir(url.adjusted(QUrl::RemoveFilename).path());
+        const QUrl dir(url.adjusted(QUrl::RemoveFilename));

         if (!dirs.contains(dir)) {
             dirs.append(dir);
         }
         if (!dirs.contains(dir)) {
             dirs.append(dir);
         }


@@ -348,7 +348,7 @@ QString DolphinTabWidget::tabName(const QUrl& url) const
     if (url == QUrl("file:///")) {
         name = '/';
     } else {
     if (url == QUrl("file:///")) {
         name = '/';
     } else {

-        name = url.fileName();
+        name = url.adjusted(QUrl::StripTrailingSlash).fileName();

         if (name.isEmpty()) {
             name = url.scheme();
         } else {
         if (name.isEmpty()) {
             name = url.scheme();
         } else {