suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't send lockReleased on Standalone restart

Browse Source 
This prevents Zotero for Firefox from starting up and shutting down when
Standalone is just restarting.
This commit is contained in:
Dan Stillman 2016-11-12 22:03:06 -05:00
parent 79700969e1
commit cfc7f36829
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/xpcom/utilities_internal.js
View File

@ -1179,6 +1179,9 @@ Zotero.Utilities.Internal = {
*/ */
quitZotero: function(restart=false) { quitZotero: function(restart=false) {
var startup = Services.startup; var startup = Services.startup;
if (restart) {
Zotero.restarting = true;
}
startup.quit(startup.eAttemptQuit | (restart ? startup.eRestart : 0) ); startup.quit(startup.eAttemptQuit | (restart ? startup.eRestart : 0) );
} }
} }

2
chrome/content/zotero/xpcom/zotero.js
View File

@ -861,9 +861,11 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
// close DB // close DB
yield Zotero.DB.closeDatabase(true) yield Zotero.DB.closeDatabase(true)
if (!Zotero.restarting) {
// broadcast that DB lock has been released // broadcast that DB lock has been released
Zotero.IPC.broadcast("lockReleased"); Zotero.IPC.broadcast("lockReleased");
} }
}
} catch(e) { } catch(e) {
Zotero.logError(e); Zotero.logError(e);
throw e; throw e;