[or-cvs] r18969: {torbutton} Prevent null docshell from aborting toggle. Still don't know (torbutton/trunk/src/chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-03-13 16:26:06 -0400 (Fri, 13 Mar 2009)
New Revision: 18969

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
Log:

Prevent null docshell from aborting toggle. Still don't know
why its null though.. Perhaps a firefox bug/extension
conflict. 



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2009-03-13 19:59:30 UTC (rev 18968)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2009-03-13 20:26:06 UTC (rev 18969)
@@ -1825,7 +1825,17 @@
 
     for (var i = 0; i < browsers.length; ++i) {
         var b = browser.browsers[i];
-        if (b) {
+        if (b && !b.docShell) {
+            try {
+                if (b.currentURI) 
+                    torbutton_log(5, "DocShell is null for: "+b.currentURI.spec);
+                else 
+                    torbutton_log(5, "DocShell is null for unknown URL");
+            } catch(e) {
+                torbutton_log(5, "DocShell is null for unparsable URL: "+e);
+            }
+        }
+        if (b && b.docShell) {
             // Only allow plugins if the tab load was from an 
             // non-tor state and the current tor state is off.
             if(kill_plugins)