[Pkg-owncloud-commits] [owncloud-client] 61/218: ShareDialog: Fix folder display #3659

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 90338499d36d453c90885c910c71a07ef1e26645
Author: Christian Kamm <mail at ckamm.de>
Date:   Fri Sep 4 15:15:26 2015 +0200

    ShareDialog: Fix folder display #3659
    
    Sometimes having a double starting / broke the display logic.
---
 src/gui/sharedialog.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index de19590..bd1245d 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));
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git