From: Christian Kamm <mail@ckamm.de>
Date: Fri, 4 Sep 2015 13:15:26 +0000 (+0200)
Subject: ShareDialog: Fix folder display #3659
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1408^2~122
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=90338499d36d453c90885c910c71a07ef1e26645;p=nextcloud-desktop.git

ShareDialog: Fix folder display #3659

Sometimes having a double starting / broke the display logic.
---

diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index de1959096..bd1245d5a 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -104,15 +104,11 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
     QString ocDir(_sharePath);
     ocDir.truncate(ocDir.length()-fileName.length());
 
-    if( ocDir == QLatin1String("/")) {
+    ocDir.replace(QRegExp("^/*"), "");
+    ocDir.replace(QRegExp("/*$"), "");
+    if( ocDir.isEmpty() ) {
         _ui->label_sharePath->setText(QString());
     } else {
-        if( ocDir.startsWith(QLatin1Char('/')) ) {
-            ocDir = ocDir.mid(1, -1);
-        }
-        if( ocDir.endsWith(QLatin1Char('/')) ) {
-            ocDir.chop(1);
-        }
         _ui->label_sharePath->setText(tr("Folder: %2").arg(ocDir));
     }