From e40f43bd2093c746bcf0d71e00b0da763fad446f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 19 Jun 2017 11:52:57 +0200
Subject: [PATCH] Migrated pads were not displayed instantly in the drive

---
 www/common/mergeDrive.js | 6 ++++--
 www/drive/main.js        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/common/mergeDrive.js b/www/common/mergeDrive.js
index fb9416f7c..b60c38e3d 100644
--- a/www/common/mergeDrive.js
+++ b/www/common/mergeDrive.js
@@ -105,7 +105,7 @@ define([
                 var oldFo = FO.init(parsed.drive, {
                     Cryptpad: Cryptpad
                 });
-                var todo = function () {
+                var onMigrated = function () {
                     oldFo.fixFiles();
                     var newData = Cryptpad.getStore().getProxy();
                     var newFo = newData.fo;
@@ -151,8 +151,10 @@ define([
                         proxy.FS_hashes = [];
                     }
                     proxy.FS_hashes.push(localStorage.FS_hash);
+                    if (typeof(cb) === "function") { cb(); }
                 };
-                oldFo.migrate(todo);
+                oldFo.migrate(onMigrated);
+                return;
             }
             if (typeof(cb) === "function") { cb(); }
         };
diff --git a/www/drive/main.js b/www/drive/main.js
index 82b916a87..d980a8aa1 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -2561,8 +2561,8 @@ define([
                     filesOp.pushData(data, function (e, id) {
                         if (e) { return void console.error("Error while creating the default pad:", e); } // TODO LIMIT?
                         filesOp.add(id);
+                        if (typeof(cb) === "function") { cb(); }
                     });
-                    if (typeof(cb) === "function") { cb(); }
                 });
                 delete sessionStorage.createReadme;
                 return;