www

commit b7f6f97cedbb69f1530998771fe81ddc9043acb7
parent 83bc0628db8489cad00d0bea7110970eb38d35c1
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 16 Dec 2013 20:32:50 -0500

Fix broken startup on Windows Aurora/Nightly

We were telling ourselves to release the DB lock because of the
discrepancy between Zotero.appName and the message window name

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

1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/ipc.js b/chrome/content/zotero/xpcom/ipc.js
@@ -181,10 +181,17 @@ Zotero.IPC = new function() {
 					{"lpData":ctypes.voidptr_t}
 			]);
 			
-			const appNames = ["Firefox", "Zotero", "Nightly", "Aurora", "Minefield"];
+			// Aurora/Nightly are always named "Firefox" in
+			// application.ini
+			const appNames = ["Firefox", "Zotero"];
+			
+			// Different from Zotero.appName; this corresponds to the
+			// name in application.ini
+			const myAppName = Services.appInfo.name;
+
 			for each(var appName in appNames) {
 				// don't send messages to ourself
-				if(appName === Zotero.appName) continue;
+				if(appName === myAppName) continue;
 				
 				var thWnd = FindWindow(appName+"MessageWindow", null);
 				if(thWnd) {