Merge pull request #13159 from keymanapp/feat/windows/13155/download-…

…to-waitingrestart feat(windows): background updates go from downloading to waiting for a restart except if the `apply now` flag is set
keymanapp · Feb 9, 2025 · 6fde1a5 · 6fde1a5
2 parents 848b1f5 + 85b8a72
commit 6fde1a5
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
@@ -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