[Pkg-owncloud-commits] [owncloud-client] 404/470: Merge pull request #4741 from owncloud/fix-alias

[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 4ea2edcf4a83c1461a43cd11602c5963cd29667f
Merge: 85bc3b2 cd29875
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Apr 26 17:34:10 2016 +0200

    Merge pull request #4741 from owncloud/fix-alias
    
    Accountsettings: Generate an alias for new folders

 src/gui/accountsettings.cpp     |  1 -
 src/gui/folderman.cpp           | 11 +++++++++--
 src/gui/folderman.h             |  2 +-
 src/gui/owncloudsetupwizard.cpp |  7 -------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --cc src/gui/folderman.cpp
index ac623c1,ec3c63c..0fad3f0
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@@ -777,11 -777,18 +777,18 @@@ Folder* FolderMan::addFolder(AccountSta
      return folder;
  }
  
- Folder* FolderMan::addFolderInternal(const FolderDefinition& folderDefinition, AccountState* accountState)
+ Folder* FolderMan::addFolderInternal(FolderDefinition folderDefinition, AccountState* accountState)
  {
+     auto alias = folderDefinition.alias;
+     int count = 0;
+     while (folderDefinition.alias.isEmpty() || _folderMap.contains(folderDefinition.alias)) {
+         // There is already a folder configured with this name and folder names need to be unique
+         folderDefinition.alias = alias + QString::number(++count);
+     }
+ 
      auto folder = new Folder(folderDefinition, accountState, this );
  
 -    qDebug() << "Adding folder to Folder Map " << folder;
 +    qDebug() << "Adding folder to Folder Map " << folder << folder->alias();
      _folderMap[folder->alias()] = folder;
      if (folder->syncPaused()) {
          _disabledFolders.insert(folder);

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