[or-cvs] r19065: {torbutton} Commit DOMWindow check. Doesn't seem to have anything to do (torbutton/trunk/src/chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-03-17 02:00:16 -0400 (Tue, 17 Mar 2009)
New Revision: 19065

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

Commit DOMWindow check. Doesn't seem to have anything
to do with Zotero failure, but what the heck, it
doesn't hurt either.



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2009-03-17 04:23:55 UTC (rev 19064)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2009-03-17 06:00:16 UTC (rev 19065)
@@ -2768,9 +2768,16 @@
     var DOMWindow = null;
 
     if(aProgress) {
-        DOMWindow = aProgress.DOMWindow;
-    } else {
         try {
+            DOMWindow = aProgress.DOMWindow;
+        } catch(e) {
+            torbutton_log(4, "Exception on DOMWindow: "+e);
+            DOMWindow = null;
+        }
+    } 
+    
+    if(!DOMWindow) {
+        try {
             if(aRequest.notificationCallbacks) {
                 DOMWindow = aRequest.notificationCallbacks.QueryInterface(
                         Components.interfaces.nsIInterfaceRequestor).getInterface(