Merge branch 'master' into zoom

2012-03-02 21:26:58 -07:00
parent 0ce7674be6 66e8fafdf2
commit b9b471f57b
5 changed files with 15 additions and 10 deletions
--- a/lib/OpenLayers/Popup.js
+++ b/lib/OpenLayers/Popup.js
@@ -685,7 +685,9 @@ OpenLayers.Popup = OpenLayers.Class({
        // 'img' properties in the context.
        //
        var onImgLoad = function() {
-            
+            if (this.popup.id === null) { // this.popup has been destroyed!
+                return;
+            }
            this.popup.updateSize();
     
            if ( this.popup.visible() && this.popup.panMapIfOutOfView ) {