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

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2195dea8819c7b47c90862e448cc8300cb17fd3b
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Aug 18 10:39:05 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Aug 19 09:25:24 2020 +0200

    Fix annoying exception on calc close with annotations.
    
    Change-Id: Ic9fbdd443419365470137858dac2e5b3de71c9b7
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100906
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 6c161540a9ba5942ba052e6c2b8aebed7ec5ef1b)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100806
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 4bf197b85..8960ddaf5 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -55,9 +55,11 @@ L.CalcTileLayer = L.TileLayer.extend({
 	},
 
 	clearAnnotations: function () {
-		for (var tab in this._annotations) {
-			this.hideAnnotations(tab);
-		}
+		if (this._map) {
+			for (var tab in this._annotations) {
+				this.hideAnnotations(tab);
+			}
+		} // else during shutdown.
 		this._annotations = {};
 	},