Remove redundant _addToolbarIcon() calls at startup

This commit is contained in:
Dan Stillman 2016-12-05 05:17:03 -05:00
parent d19732ba5f
commit c54af7a5ae

View file

@ -310,7 +310,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
Zotero.DataDirectory.choose(); Zotero.DataDirectory.choose();
} }
} }
_addToolbarIcon();
return; return;
} }
// DEBUG: handle more startup errors // DEBUG: handle more startup errors
@ -348,7 +347,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
]); ]);
Zotero.startupError = msg; Zotero.startupError = msg;
Zotero.logError(e); Zotero.logError(e);
_addToolbarIcon();
return false; return false;
} }
throw (e); throw (e);
@ -392,7 +390,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
return _initFull() return _initFull()
.then(function (success) { .then(function (success) {
if (!success) { if (!success) {
_addToolbarIcon();
return false; return false;
} }
@ -416,8 +413,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
this.initializationDeferred.resolve(); this.initializationDeferred.resolve();
if(Zotero.isConnector) { if(Zotero.isConnector) {
_addToolbarIcon();
Zotero.Repo.init(); Zotero.Repo.init();
Zotero.locked = false; Zotero.locked = false;
} }