web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix race condition with nthen

Browse Source
This commit is contained in:
yflory 2019-06-06 15:33:08 +02:00
parent 5477b83865
commit 62c96d562f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/migrate-user-object.js
View File

@ -197,7 +197,7 @@ define([
}, 500); }, 500);
progress(0, 0);*/ progress(0, 0);*/
}).nThen(function () { }).nThen(function () {
cb(); setTimeout(cb);
}); });
}; };
}); });

2
www/common/outer/async-store.js
View File

@ -1644,6 +1644,7 @@ define([
}); });
userObject.migrate(waitFor()); userObject.migrate(waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
loadMailbox(waitFor);
Migrate(proxy, waitFor(), function (version, progress) { Migrate(proxy, waitFor(), function (version, progress) {
postMessage(clientId, 'LOADING_DRIVE', { postMessage(clientId, 'LOADING_DRIVE', {
state: (2 + (version / 10)), state: (2 + (version / 10)),
@ -1661,7 +1662,6 @@ define([
loadMessenger(); loadMessenger();
loadCursor(); loadCursor();
loadOnlyOffice(); loadOnlyOffice();
loadMailbox(waitFor);
loadUniversal(Profile, 'profile', waitFor); loadUniversal(Profile, 'profile', waitFor);
cleanFriendRequests(); cleanFriendRequests();
}).nThen(function () { }).nThen(function () {