[Pkg-owncloud-commits] [owncloud-client] 92/115: FolderMan: Do not remove the folder icon too early from the map.

[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 4356005c5ac0e518b0322d6799c74ca0d0b971d6
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Aug 20 14:36:09 2014 +0200

    FolderMan: Do not remove the folder icon too early from the map.
    
    Otherwise, method unloadFolder can not do important frees.
    
    This is one part of the fix for #2073 because now the socketapi will
    send the UNREGISTER_PATH message over the socket.
---
 src/mirall/folderman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 15a8e59..c530c17 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -576,7 +576,7 @@ void FolderMan::removeFolder( const QString& alias )
 
     if( _folderMap.contains( alias )) {
         qDebug() << "Removing " << alias;
-        f = _folderMap.take( alias );
+        f = _folderMap[alias]; // do not remove from the map, that is done in unloadFolder.
     } else {
         qDebug() << "!! Can not remove " << alias << ", not in folderMap.";
     }

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