www

commit e7ba86216e443c8486145cc08e6da69c061506e9
parent c83d64ad0d90599e8c235c98b09b0d62dc534aa8
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon, 10 May 2010 21:13:52 +0000

Fix startup error due to incorrect integration pipe permissions


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

1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -67,7 +67,20 @@ Zotero.Integration = new function() {
 			Zotero.debug("Initializing Zotero integration pipe at "+_fifoFile.path);
 			
 			// destroy old pipe, if one exists
-			if(_fifoFile.exists()) _fifoFile.remove(false);
+			try {
+				if(_fifoFile.exists()) {
+					_fifoFile.remove(false);
+				}
+			}
+			catch (e) {
+				Zotero.debug("Could not remove old integration pipe", 1);
+				Components.utils.reportError(
+					"Zotero word processor integration initialization failed. "
+						+ "See http://forums.zotero.org/discussion/12054/#Item_10 "
+						+ "for instructions on correcting this problem."
+				);
+				return;
+			}
 			
 			// make a new pipe
 			var mkfifo = Components.classes["@mozilla.org/file/local;1"].