From b0dde2ecb422f87708fe16573316696d23218bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Thu, 20 Jun 2013 16:10:11 +0200
Subject: [PATCH] Do not call setMap(null) if control not in map

---
 src/ol/map.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ol/map.js b/src/ol/map.js
index d08576f636..eb8632d0f6 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -830,8 +830,11 @@ ol.Map.prototype.requestRenderFrame = function() {
 ol.Map.prototype.removeControl = function(control) {
   var controls = this.getControls();
   goog.asserts.assert(goog.isDef(controls));
-  control.setMap(null);
-  return /** @type {ol.control.Control|undefined} */ (controls.remove(control));
+  if (goog.isDef(controls.remove(control))) {
+    control.setMap(null);
+    return control;
+  }
+  return undefined;
 };