fix Bug 34322, Bug 34374

951a9cd3 · Sergey Luzyanin · 3fba3d08 · 951a9cd3
Commit 951a9cd3 authored Mar 16, 2017 by Sergey Luzyanin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

slide/Editor/Format/Presentation.js slide/Editor/Format/Presentation.js +5 -1

No files found.
--- a/slide/Editor/Format/Presentation.js
+++ b/slide/Editor/Format/Presentation.js
@@ -802,7 +802,11 @@ CPresentation.prototype =
    },
    Continue_FastCollaborativeEditing: function()
    {
-        if (true !== AscCommon.CollaborativeEditing.Is_Fast() || true === this.CollaborativeEditing.Is_SingleUser())
+        if (true === AscCommon.CollaborativeEditing.Get_GlobalLock())
+            return;
+        if (this.Api.isLongAction())
+            return;
+        if (true !== AscCommon.CollaborativeEditing.Is_Fast() || true === AscCommon.CollaborativeEditing.Is_SingleUser())
            return;

        if(this.Slides[this.CurPage]){