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

Fix error when attempting a Restore from Server immediately after Restore to Server

Browse source
This commit is contained in:
Dan Stillman 2009-01-02 17:36:49 +00:00
parent fa4df719e1
commit d98f0ab07a
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/preferences/preferences.js
View file

@ -293,7 +293,7 @@ function handleSyncReset(action) {
// TODO: better error handling // TODO: better error handling
// Verify username and password // Verify username and password
Zotero.Sync.Server.login(function () { var callback = function () {
Zotero.Schema.stopRepositoryTimer(); Zotero.Schema.stopRepositoryTimer();
Zotero.Sync.Runner.clearSyncTimeout(); Zotero.Sync.Runner.clearSyncTimeout();
@ -317,7 +317,15 @@ function handleSyncReset(action) {
.getService(Components.interfaces.nsIAppStartup); .getService(Components.interfaces.nsIAppStartup);
appStartup.quit(Components.interfaces.nsIAppStartup.eRestart); appStartup.quit(Components.interfaces.nsIAppStartup.eRestart);
appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit); appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit);
}); };
// TODO: better way of checking for an active session?
if (Zotero.Sync.Server.sessionIDComponent == 'sessionid=') {
Zotero.Sync.Server.login(callback);
}
else {
callback();
}
break; break;
// Cancel // Cancel