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

[Pranam Lashkari (via logerrit)]

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

New commits:
commit 43851278fe626038ce1cbc646b13c6a1887b1a09
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Fri Apr 10 00:23:50 2020 +0530
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Apr 10 13:35:20 2020 +0200

    leaflet: resolved android crash issue due to unhandled exception
    
    Change-Id: I2a2779df358bd629a3419e0e6ad3d9055a32800b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91997
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 298794d7b05db39b9f95f19693bea42388590b27)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92012

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index a38f88049..6041f845a 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2144,15 +2144,15 @@ L.TileLayer = L.GridLayer.extend({
 		&& scroll !== false
 		&& !this._map.getBounds().contains(this._visibleCursor)
 		&& this._map._isCursorVisible
-		&& this._map._clip._selectionType !== 'complex') {
+		&& (!this._map._clip || this._map._clip._selectionType !== 'complex')) {
 
 			var center = this._map.project(cursorPos);
 			center = center.subtract(this._map.getSize().divideBy(2));
 			center.x = Math.round(center.x < 0 ? 0 : center.x);
 			center.y = Math.round(center.y < 0 ? 0 : center.y);
 			if (!(this._selectionHandles.start && this._selectionHandles.start.isDragged) &&
-			    !(this._selectionHandles.end && this._selectionHandles.end.isDragged) &&
-			    !(docLayer._followEditor || docLayer._followUser)) {
+				!(this._selectionHandles.end && this._selectionHandles.end.isDragged) &&
+				!(docLayer._followEditor || docLayer._followUser)) {
 				this._map.fire('scrollto', {x: center.x, y: center.y, calledFromInvalidateCursorMsg: scroll !== undefined});
 			}
 		}