Skip to content

Restore Ready state if quit is vetoed during quitAndInstall() #308334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitrivMS merged 1 commit into from
Apr 7, 2026
+11 −0
Merged

Restore Ready state if quit is vetoed during quitAndInstall() #308334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/vs/platform/update/electron-main/abstractUpdateService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,17 @@ export abstract class AbstractUpdateService implements IUpdateService {
}
}

// Remember the Ready state so we can restore it if the quit is vetoed
const readyState = this.state;

this.setState(State.Restarting(this.state.update));
this.logService.trace('update#quitAndInstall(): before lifecycle quit()');

this.lifecycleMainService.quit(true /* will restart */).then(vetod => {
this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);
if (vetod) {
this.logService.info('update#quitAndInstall(): quit was vetoed, restoring Ready state');
this.setState(readyState);
return;
}

Expand Down
6 changes: 6 additions & 0 deletions src/vs/platform/update/electron-main/updateService.snap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,17 @@ abstract class AbstractUpdateService implements IUpdateService {
return Promise.resolve(undefined);
}

// Remember the Ready state so we can restore it if the quit is vetoed
const readyState = this.state;

this.setState(State.Restarting(this.state.update));
this.logService.trace('update#quitAndInstall(): before lifecycle quit()');

this.lifecycleMainService.quit(true /* will restart */).then(vetod => {
this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);
if (vetod) {
this.logService.info('update#quitAndInstall(): quit was vetoed, restoring Ready state');
this.setState(readyState);
return;
}

Expand Down
Loading