diff options
| -rw-r--r-- | application/palemoon/base/content/utilityOverlay.js | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/update/nsUpdateService.js | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js index d7c8088c7..1d284ba2a 100644 --- a/application/palemoon/base/content/utilityOverlay.js +++ b/application/palemoon/base/content/utilityOverlay.js @@ -558,7 +558,7 @@ function checkForUpdates() // If there's an update ready to be applied, show the "Update Downloaded" // UI instead and let the user know they have to restart the application for // the changes to be applied. - if (um.activeUpdate && um.activeUpdate.state == "pending") + if (um.activeUpdate && ["pending", "pending-elevate", "applied"].includes(um.activeUpdate.state)) prompter.showUpdateDownloaded(um.activeUpdate); else prompter.checkForUpdates(); diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 64eb995a2..dca0a007e 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -3498,8 +3498,8 @@ UpdatePrompt.prototype = { return; } - this._showUnobtrusiveUI(null, URI_UPDATE_PROMPT_DIALOG, null, - UPDATE_WINDOW_NAME, "updatesavailable", update); + this._showUI(null, URI_UPDATE_PROMPT_DIALOG, null, + UPDATE_WINDOW_NAME, "updatesavailable", update); }, /** @@ -3515,13 +3515,8 @@ UpdatePrompt.prototype = { if (this._getAltUpdateWindow()) return; - if (background) { - this._showUnobtrusiveUI(null, URI_UPDATE_PROMPT_DIALOG, null, - UPDATE_WINDOW_NAME, "finishedBackground", update); - } else { - this._showUI(null, URI_UPDATE_PROMPT_DIALOG, null, - UPDATE_WINDOW_NAME, "finishedBackground", update); - } + this._showUI(null, URI_UPDATE_PROMPT_DIALOG, null, + UPDATE_WINDOW_NAME, "finishedBackground", update); }, /** |