Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-05-31 07:28:33 +08:00
commit 6431b85501
96 changed files with 16647 additions and 13653 deletions

View file

@ -568,7 +568,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();