www

commit 4c97ee3ce5004b2cdd992adb702a88209eb40ffd
parent ad6e4242a926c94130cedcfe832d815cded1ce72
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 13 Feb 2012 20:50:44 -0500

Unregister ConsoleListener on Zotero shutdown

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -429,11 +429,6 @@ const ZOTERO_CONFIG = {
 		var _shutdownObserver = {observe:Zotero.shutdown};
 		observerService.addObserver(_shutdownObserver, "quit-application", false);
 		
-		// Add shutdown listerner to remove observer
-		this.addShutdownListener(function() {
-			observerService.removeObserver(_shutdownObserver, "quit-application", false);
-		});
-		
 		Zotero.IPC.init();
 		
 		var cs = Components.classes["@mozilla.org/consoleservice;1"].
@@ -445,6 +440,12 @@ const ZOTERO_CONFIG = {
 		// Register error observer
 		cs.registerListener(ConsoleListener);
 		
+		// Add shutdown listener to remove quit-application observer and console listener
+		this.addShutdownListener(function() {
+			observerService.removeObserver(_shutdownObserver, "quit-application", false);
+			cs.unregisterListener(ConsoleListener);
+		});
+		
 		// Load additional info for connector or not
 		if(Zotero.isConnector) {
 			Zotero.debug("Loading in connector mode");