Skip to content
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

feat(windows): background updates go from downloading to waiting for a restart except if the apply now flag is set #13159

Merged
merged 1 commit into from
Feb 9, 2025
Merged

feat(windows): background updates go from downloading to waiting for a restart except if the apply now flag is set #13159

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
16 changes: 7 additions & 9 deletions windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,19 +778,17 @@ procedure DownloadingState.Enter;
end
else
begin
if HasKeymanRun then
// TODO: #8993 for stage 2 we can got to the InstallingState
// or even have a call back to notify the user to installation
// is about to begin.
if bucStateContext.GetApplyNow then
begin
if bucStateContext.GetApplyNow then
begin
bucStateContext.SetApplyNow(False);
ChangeState(InstallingState);
end
else
ChangeState(WaitingRestartState);
bucStateContext.SetApplyNow(False);
ChangeState(InstallingState);
end
else
begin
ChangeState(InstallingState);
ChangeState(WaitingRestartState);
end;
end

Expand Down