ShareDialog: Fix folder display #3659
authorChristian Kamm <mail@ckamm.de>
Fri, 4 Sep 2015 13:15:26 +0000 (15:15 +0200)
committerChristian Kamm <mail@ckamm.de>
Fri, 4 Sep 2015 13:16:25 +0000 (15:16 +0200)
Sometimes having a double starting / broke the display logic.

src/gui/sharedialog.cpp

index de1959096df2b53158eac43b5bea3f894f67cdc2..bd1245d5a7f95a0ce7a0502dcd3de36d2d965ba9 100644 (file)
@@ -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));
     }