X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=blobdiff_plain;f=js%2Fsyp.js;h=d83b1fefe44801cfb69318dc671cac378c54820d;hp=e350d88af3ea303dbe1aeeae820351ff8d6fdc5f;hb=71623749afbd4c1faf523a4ef0f99320a91c68f4;hpb=f91e6abb7675a2f526a444b4558800e6d76c2d8d

diff --git a/js/syp.js b/js/syp.js
index e350d88..d83b1fe 100644
--- a/js/syp.js
+++ b/js/syp.js
@@ -136,7 +136,11 @@ var SYP = {
         if (permaControl[0]) {
             permaControl[0].div.style.display = "";
         }
-        var popup = feature.popup;
+        if (!feature.popup) {
+            this.map.events.unregister("movestart", this, this._unselect);
+            return;
+        }
+        popup = feature.popup;
         if (popup.visible()) {
             popup.hide();
         }
@@ -154,7 +158,7 @@ var SYP = {
 
         // we cannot reuse popup; we need to recreate it in order for IE
         // expressions to work. Otherwise, we get a 0x0 image on second view.
-        if (popup) { 
+        if (popup) {
             popup.destroy();
         }
         var contentHTML;
@@ -166,6 +170,10 @@ var SYP = {
         } else {
             contentHTML = feature.attributes.description;
         }
+        if (!contentHTML || !contentHTML.length) {
+            this.map.events.register("movestart", this, this._unselect = function () { this.unselect(feature)});
+            return;
+        }
         popup = SYP.createPopup(brCorner, contentHTML);
         var control = this;
         popup.hide = function () {