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

[Michael Meeks (via logerrit)]

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

New commits:
commit 2adc32fab52944da935a226269c67dbf98654319
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Feb 13 02:55:50 2020 +0000
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Feb 13 04:48:44 2020 +0100

    impress: cleanup preview invalidator & avoid null this._map on close.
    
    Change-Id: I96f9cb217c6a479dfee91dc471ab442cd2d014ae
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88576
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 568796e47..3938a973a 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -279,6 +279,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
 
 	onRemove: function (map) {
 		map.off('updatemaxbounds', this._onUpdateMaxBounds, this);
+		clearTimeout(this._previewInvalidator);
 	},
 
 	onAnnotationCancel: function () {
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 46bd3c0a7..7be34c242 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3161,7 +3161,7 @@ L.TileLayer = L.GridLayer.extend({
 	},
 
 	_invalidatePreviews: function () {
-		if (this._map._docPreviews && this._previewInvalidations.length > 0) {
+		if (this._map && this._map._docPreviews && this._previewInvalidations.length > 0) {
 			var toInvalidate = {};
 			for (var i = 0; i < this._previewInvalidations.length; i++) {
 				var invalidBounds = this._previewInvalidations[i];