fix unloading finally

gavinsharp · Jan 16, 2013 · 23160e3 · 23160e3
1 parent 7e6bd08
commit 23160e3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/SaveAsFilename.xpi b/SaveAsFilename.xpi
diff --git a/bootstrap.js b/bootstrap.js
@@ -57,30 +57,20 @@ function startup(aData, aReason) {
 }
 
 function shutdown(aData, aReason) {
-  function log(msg) {
-    Components.utils.reportError("Gavin: " + msg);
-  }
-  log("Shutdown");
   if (aReason != APP_SHUTDOWN) {
-    log("Not app shutdown");
     let enumerator = Services.wm.getEnumerator("navigator:browser");
     while (enumerator.hasMoreElements()) {
       let win = XPCNativeWrapper.unwrap(enumerator.getNext());
-      log("Found window");
       if (win._saveAsFilename_getDefaultFileName) {
-        log("removing prop from window");
         win.getDefaultFileName = win._saveAsFilename_getDefaultFileName;
         delete win._saveAsFilename_getDefaultFileName;
       }
     }
 
     unloaders.forEach(function (f) {
       try {
-        log("unloading");
         f();
-      } catch (ex) {
+      } catch (ex) {}
-        log("unloading failed: " + ex);
-      }
     });
   }
 }
@@ -89,7 +79,6 @@ function install(aData, aReason) { }
 
 function uninstall(aData, aReason) { }
 
-
 /* Code from: https://github.com/Mardak/restartless/blob/watchWindows/bootstrap.js */
 let unloaders = [];
 
@@ -134,4 +123,3 @@ function watchWindows(callback) {
   Services.ww.registerNotification(windowWatcher);
   unloaders.push(function() Services.ww.unregisterNotification(windowWatcher));
 }
-