www

commit 59459df0ffd7f7351ee9becbda912f5644cb4570
parent 70371a868b7bf9769bdf531ebab85eb441dd9e7a
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 13 Jul 2011 21:19:15 +0000

Don't pop up a message when running conflicting Zotero versions simultaneously


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

1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -89,11 +89,7 @@ Zotero.Integration = new function() {
 		// destroy old pipe, if one exists
 		try {
 			if(_fifoFile.exists()) {
-				if(_fifoFile.isSpecial() && Zotero.IPC.safePipeWrite(_fifoFile.path, "Zotero test\n")) {
-					Zotero.debug("Integration pipe already open by another instance; not initializing integration pipe");
-					return;
-				}
-				
+				Zotero.IPC.safePipeWrite(_fifoFile.path, "Zotero shutdown\n");
 				_fifoFile.remove(false);
 			}
 		} catch (e) {
@@ -201,8 +197,6 @@ Zotero.Integration = new function() {
 	 */
 	function _parseIntegrationPipeCommand(string) {
 		if(string != "") {
-			if(string === "Zotero test\n") return;
-			
 			// exec command if possible
 			var parts = string.match(/^([^ \n]*) ([^ \n]*)(?: ([^\n]*))?\n?$/);
 			if(parts) {