commit 460a423df3886dbe26ce0ffd525676c456b23adf
parent 71f7ec5207b19c1556dafbeefefd00ecc4571be8
Author: Dan Stillman <dstillman@zotero.org>
Date: Sat, 14 Apr 2018 10:09:57 -0400
Don't let an progress window block shutdown
Closes #1485
Diffstat:
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/progressWindow.js b/chrome/content/zotero/xpcom/progressWindow.js
@@ -154,6 +154,9 @@ Zotero.ProgressWindow = function(options = {}) {
_progressWindow.addEventListener("mouseover", _onMouseOver, false);
_progressWindow.addEventListener("mouseout", _onMouseOut, false);
_progressWindow.addEventListener("mouseup", _onMouseUp, false);
+ _window.addEventListener('close', () => {
+ this.close();
+ });
_windowLoading = true;
@@ -281,7 +284,10 @@ Zotero.ProgressWindow = function(options = {}) {
try {
_progressWindow.close();
- } catch(ex) {}
+ }
+ catch (e) {
+ Zotero.logError(e);
+ }
}
/**