mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Don't open a new integration pipe if there is already an integration pipe open. Fixes hangs on shutdown after launching multiple Zotero instances.

Browse source
This commit is contained in:
Simon Kornblith 2011-07-13 16:41:00 +00:00
parent ff90005ed2
commit 971dd5c69c
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/integration.js
View file

@ -89,6 +89,11 @@ Zotero.Integration = new function() {
// destroy old pipe, if one exists // destroy old pipe, if one exists
try { try {
if(_fifoFile.exists()) { 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;
}
_fifoFile.remove(false); _fifoFile.remove(false);
} }
} catch (e) { } catch (e) {
@ -196,6 +201,8 @@ Zotero.Integration = new function() {
*/ */
function _parseIntegrationPipeCommand(string) { function _parseIntegrationPipeCommand(string) {
if(string != "") { if(string != "") {
if(string === "Zotero test\n") return;
// exec command if possible // exec command if possible
var parts = string.match(/^([^ \n]*) ([^ \n]*)(?: ([^\n]*))?\n?$/); var parts = string.match(/^([^ \n]*) ([^ \n]*)(?: ([^\n]*))?\n?$/);
if(parts) { if(parts) {