[Libreoffice-commits] online.git: loleaflet/src

[Michael Meeks (via logerrit)]

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

New commits:
commit 3e67e434e4d4976939efbc71502fc573e8d417e7
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: Wed Apr 1 18:10:23 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/+/91489
    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 5245d085f..add537854 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2230,7 +2230,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() {