From 47e3cffde72caab93edd0093da30fefe182892e0 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 21 Jan 2020 18:50:45 +0100
Subject: [PATCH] Fix race condition onlyoffice

---
 www/common/onlyoffice/inner.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 673078862..438e49fe6 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -535,16 +535,6 @@ define([
                 type: "documentOpen",
                 data: {"type":"open","status":"ok","data":{"Editor.bin":obj.openCmd.url}}
             });
-            if (APP.migrate && !readOnly) {
-                var div = h('div.cp-oo-x2tXls', [
-                    h('span.fa.fa-spin.fa-spinner'),
-                    h('span', Messages.oo_sheetMigration_loading)
-                ]);
-                UI.openCustomModal(UI.dialog.customModal(div, {buttons: []}));
-                setTimeout(function () {
-                    makeCheckpoint(true);
-                }, 1000);
-            }
             // Update current index
             var last = ooChannel.queue.pop();
             if (last) { ooChannel.lastHash = last.hash; }
@@ -786,6 +776,18 @@ define([
                             });
                         }
                     },
+                    "onDocumentReady": function () {
+                        if (APP.migrate && !readOnly) {
+                            var div = h('div.cp-oo-x2tXls', [
+                                h('span.fa.fa-spin.fa-spinner'),
+                                h('span', Messages.oo_sheetMigration_loading)
+                            ]);
+                            UI.openCustomModal(UI.dialog.customModal(div, {buttons: []}));
+                            setTimeout(function () {
+                                makeCheckpoint(true);
+                            }, 1000);
+                        }
+                    }
                 }
             };
             window.onbeforeunload = function () {