[Pkg-owncloud-commits] [owncloud-client] 61/498: Add folder: Do not add at other accounts folder to know if you can add a folder

[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 92e259c2764ea6a9fad3793ff7f274784eac4b65
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Apr 28 11:29:35 2015 +0200

    Add folder: Do not add at other accounts folder to know if you can add a folder
---
 src/gui/folderwizard.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 0216acd..4382a37 100644
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -19,6 +19,7 @@
 #include "networkjobs.h"
 #include "account.h"
 #include "selectivesyncdialog.h"
+#include "accountstate.h"
 #include "creds/abstractcredentials.h"
 
 #include <QDebug>
@@ -485,6 +486,9 @@ bool FolderWizardRemotePath::isComplete() const
     Folder::Map::const_iterator i = map.constBegin();
     for(i = map.constBegin();i != map.constEnd(); i++ ) {
         Folder *f = static_cast<Folder*>(i.value());
+        if (f->accountState()->account() != _account) {
+            continue;
+        }
         QString curDir = f->remotePath();
         if (!curDir.startsWith(QLatin1Char('/'))) {
             curDir.prepend(QLatin1Char('/'));

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