From cddeb2af7c7c5846c1cba3a303df5af9e1637a80 Mon Sep 17 00:00:00 2001 From: Micah Loffer Date: Fri, 10 May 2019 15:01:21 -0700 Subject: [PATCH] Add safety check for MapService.mapInstance before attempting to remove --- projects/ngx-mapbox-gl/src/lib/map/map.service.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/ngx-mapbox-gl/src/lib/map/map.service.ts b/projects/ngx-mapbox-gl/src/lib/map/map.service.ts index 7811205d5..48d5f3779 100644 --- a/projects/ngx-mapbox-gl/src/lib/map/map.service.ts +++ b/projects/ngx-mapbox-gl/src/lib/map/map.service.ts @@ -107,8 +107,10 @@ export class MapService { } destroyMap() { - this.subscription.unsubscribe(); - this.mapInstance.remove(); + if(this.mapInstance) { + this.subscription.unsubscribe(); + this.mapInstance.remove(); + } } updateMinZoom(minZoom: number) {