[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-7' - loleaflet/src

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/core/Socket.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit af3eac30979ea55edac22506f428c686ad46a8cc
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Aug 6 14:27:59 2020 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Aug 7 17:32:10 2020 +0200

    Fix resuming after idle
    
    In other apps than Calc there was an error when trying
    to resume after idle:
    
    Uncaught TypeError: Cannot set property 'id' of null
        at HTMLDivElement.restartConnectionFn (Socket.js:490)
    
    Change-Id: I0b3c8d907aa220a3b9504ff62b0437c121bd3619
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100241
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 8409f1ce2f6585aa82b0b21c7e9bb791f48b6a1b)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100350
    Tested-by: Aron Budea <aron.budea at collabora.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 77c813232..41b173209 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -487,7 +487,8 @@ L.Socket = L.Class.extend({
 						console.debug('idleness: reactivating');
 						map._documentIdle = false;
 						// force reinitialization of calcInputBar(formulabar)
-						map.dialog._calcInputBar.id = null;
+						if (map.dialog._calcInputBar)
+							map.dialog._calcInputBar.id = null;
 						return map._activate();
 					}
 					return false;