From 59459df0ffd7f7351ee9becbda912f5644cb4570 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 13 Jul 2011 21:19:15 +0000 Subject: [PATCH] Don't pop up a message when running conflicting Zotero versions simultaneously --- 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 index caff36868..a99167b44 100644 --- 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) {