From 460a423df3886dbe26ce0ffd525676c456b23adf Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 14 Apr 2018 10:09:57 -0400 Subject: [PATCH] Don't let an progress window block shutdown Closes #1485 --- chrome/content/zotero/xpcom/progressWindow.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/progressWindow.js b/chrome/content/zotero/xpcom/progressWindow.js index 09ea7440c..cedd58dd6 100644 --- 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); + } } /**