Make sure to only destroy if the _iframe was created

aschmitz · Nov 1, 2010 · 7a5197c · 7a5197c
1 parent 9fb0b3e
commit 7a5197c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/lib/transports/htmlfile.js b/lib/transports/htmlfile.js
@@ -41,12 +41,14 @@
 		var script = doc.getElementsByTagName('script')[0];
 		script.parentNode.removeChild(script);
 	};
-
-	HTMLFile.prototype._destroy = function(){
-		this._iframe.src = 'about:blank';
-		this._doc = null;
-		CollectGarbage();
-	};
+
+  HTMLFile.prototype._destroy = function(){
+    if (this._iframe){
+      this._iframe.src = 'about:blank';
+      this._doc = null;
+      CollectGarbage();
+    }
+  };
 
 	HTMLFile.prototype.disconnect = function(){
 		this._destroy();

diff --git a/socket.io.js b/socket.io.js
@@ -511,12 +511,14 @@ if (typeof window != 'undefined'){
 		var script = doc.getElementsByTagName('script')[0];
 		script.parentNode.removeChild(script);
 	};
-
-	HTMLFile.prototype._destroy = function(){
-		this._iframe.src = 'about:blank';
-		this._doc = null;
-		CollectGarbage();
-	};
+
+  HTMLFile.prototype._destroy = function(){
+    if (this._iframe){
+      this._iframe.src = 'about:blank';
+      this._doc = null;
+      CollectGarbage();
+    }
+  };
 
 	HTMLFile.prototype.disconnect = function(){
 		this._destroy();