Merge pull request leforthomas#5 from Aviture/remove-markers-safely

Add check to safely remove markers
sclem · Jan 27, 2016 · 216546d · 216546d
2 parents 0fd2e69 + 409ad09
commit 216546d
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/DrawHelper.js b/DrawHelper.js
@@ -801,7 +801,9 @@ var DrawHelper = (function() {
 
         this.startDrawing(
             function() {
-                markers.remove();
+                if (markers != null) {
+                    markers.remove();
+                }
                 mouseHandler.destroy();
                 tooltip.setVisible(false);
             }
@@ -857,7 +859,9 @@ var DrawHelper = (function() {
         this.startDrawing(
             function() {
                 primitives.remove(poly);
-                markers.remove();
+                if (markers != null) {
+                    markers.remove();
+                }
                 mouseHandler.destroy();
                 tooltip.setVisible(false);
             }
@@ -968,7 +972,9 @@ var DrawHelper = (function() {
                 if(extent != null) {
                     primitives.remove(extent);
                 }
-                markers.remove();
+                if (markers != null) {
+                    markers.remove();
+                }
                 mouseHandler.destroy();
                 tooltip.setVisible(false);
             }
@@ -1050,7 +1056,9 @@ var DrawHelper = (function() {
                 if(circle != null) {
                     primitives.remove(circle);
                 }
-                markers.remove();
+                if (markers != null) {
+                    markers.remove();
+                }
                 mouseHandler.destroy();
                 tooltip.setVisible(false);
             }