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

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 678603049465851e09c189014960553b4476618e
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Apr 1 14:44:59 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Apr 2 10:09:09 2020 +0200

    Avoid de-referencing non-existing marker.
    
    This screws up cursors across views in some circumstances,
    when there is no marker in one of the views.
    
    Regression from 3b0478baab1e58a45fc723e9265942bf5d4c10fa
    
    Change-Id: Ia1294d83801d656a919f97206b7b573a1b74b77f
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91508
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 17521d449..bfac945ab 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2253,7 +2253,8 @@ L.TileLayer = L.GridLayer.extend({
 			this._viewLayerGroup.removeLayer(viewCursorMarker);
 		}
 
-		this._viewCursors[viewId].marker.showCursorHeader();
+		if (this._viewCursors[viewId].marker)
+			this._viewCursors[viewId].marker.showCursorHeader();
 	},
 
 	updateAllViewCursors : function() {