mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge branch 'master' into development

Browse source
This commit is contained in:
Scott Nonnenberg 2017-12-06 12:45:26 -08:00
commit 53d7761e43
No known key found for this signature in database
GPG key ID: A4931C09644C654B
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/auto_update.js
View file

@ -40,8 +40,13 @@ function showUpdateDialog(mainWindow, messages) {
dialog.showMessageBox(mainWindow, options, function(response) {
if (response == RESTART_BUTTON) {
windowState.markShouldQuit();
autoUpdater.quitAndInstall();
// We delay these update calls because they don't seem to work in this
// callback - but only if the message box has a parent window.
// Fixes this bug: https://github.com/WhisperSystems/Signal-Desktop/issues/1864
setTimeout(function() {
windowState.markShouldQuit();
autoUpdater.quitAndInstall();
}, 200);
}
showingDialog = false;