From cab595f95946ee22978732a18846f2a51911123e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 4 Jul 2017 14:51:35 +0200
Subject: [PATCH] Fix duplicate folders in the drive

---
 www/common/mergeDrive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/mergeDrive.js b/www/common/mergeDrive.js
index b60c38e3d..ce3e0b157 100644
--- a/www/common/mergeDrive.js
+++ b/www/common/mergeDrive.js
@@ -86,7 +86,7 @@ define([
     exp.anonDriveIntoUser = function (proxy, cb) {
         // Make sure we have an FS_hash and we don't use it, otherwise just stop the migration and cb
         if (!localStorage.FS_hash || !Cryptpad.isLoggedIn()) {
-            if (typeof(cb) === "function") { cb(); }
+            if (typeof(cb) === "function") { return void cb(); }
         }
         // Get the content of FS_hash and then merge the objects, remove the migration key and cb
         var todo = function (err, doc) {