Don't display startup error when switching into connector mode
And close DB on incompatible version error This should make things a bit smoother for people upgrading to 5.0 before Zotero for Firefox is updated to the connector.
This commit is contained in:
parent
2ef84125e7
commit
4d4c0f9e73
|
@ -103,6 +103,13 @@ var ZoteroOverlay = new function()
|
||||||
if(newMode == "connector") {
|
if(newMode == "connector") {
|
||||||
// save current state
|
// save current state
|
||||||
_stateBeforeReload = !zoteroPane.hidden && !zoteroPane.collapsed;
|
_stateBeforeReload = !zoteroPane.hidden && !zoteroPane.collapsed;
|
||||||
|
|
||||||
|
// Don't display startup error when Standalone opens
|
||||||
|
if (Zotero.startupError) {
|
||||||
|
Zotero.debug(startupError, 1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// ensure pane is closed
|
// ensure pane is closed
|
||||||
if(!zoteroPane.collapsed) ZoteroOverlay.toggleDisplay(false, true);
|
if(!zoteroPane.collapsed) ZoteroOverlay.toggleDisplay(false, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -611,6 +611,8 @@ Components.utils.import("resource://gre/modules/Services.jsm");
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
if (e instanceof Zotero.DB.IncompatibleVersionException) {
|
if (e instanceof Zotero.DB.IncompatibleVersionException) {
|
||||||
|
Zotero.DB.closeDatabase(true).then(() => Zotero.debug("Database closed"));
|
||||||
|
|
||||||
let kbURL = "https://www.zotero.org/support/kb/newer_db_version";
|
let kbURL = "https://www.zotero.org/support/kb/newer_db_version";
|
||||||
let msg = (e.dbClientVersion
|
let msg = (e.dbClientVersion
|
||||||
? Zotero.getString('startupError.incompatibleDBVersion',
|
? Zotero.getString('startupError.incompatibleDBVersion',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user