call integration.cleanup() before attempting to display any dialogs

This commit is contained in:
Simon Kornblith 2010-07-06 06:53:45 +00:00
parent 13f0b1bfd2
commit 477d0effe0

View file

@ -213,7 +213,9 @@ Zotero.Integration = new function() {
// Try to execute the command; otherwise display an error in the word processor
try {
integration[command]();
integration.cleanup();
} catch(e) {
integration.cleanup();
if(!(e instanceof Zotero.Integration.UserCancelledException)) {
if(e instanceof Zotero.Integration.DisplayException) {
integration._doc.displayAlert(e.toString(),
@ -255,7 +257,6 @@ Zotero.Integration = new function() {
}
} finally {
_inProgress = false;
integration.cleanup();
}
}