Fix race condition with nthen

6 years ago · 62c96d562f
parent 5477b83865
commit 62c96d562f
2 changed files with 2 additions and 2 deletions
--- a/www/common/migrate-user-object.js
+++ b/www/common/migrate-user-object.js
@ -197,7 +197,7 @@ define([
            }, 500);
            progress(0, 0);*/
        }).nThen(function () {
-            cb();
+            setTimeout(cb);
        });
    };
 });
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@ -1644,6 +1644,7 @@ define([
                });
                userObject.migrate(waitFor());
            }).nThen(function (waitFor) {
+                loadMailbox(waitFor);
                Migrate(proxy, waitFor(), function (version, progress) {
                    postMessage(clientId, 'LOADING_DRIVE', {
                        state: (2 + (version / 10)),
@ -1661,7 +1662,6 @@ define([
                loadMessenger();
                loadCursor();
                loadOnlyOffice();
-                loadMailbox(waitFor);
                loadUniversal(Profile, 'profile', waitFor);
                cleanFriendRequests();
            }).nThen(function () {