Merge pull request #15269 from keymanapp/fix/windows/14261/splash-screen-unresponsive

fix(windows): unresponsive splash screen

Author: rc-swag

windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas

@@ -774,7 +774,8 @@ procedure UpdateAvailableState.HandleAbort;
 procedure UpdateAvailableState.HandleInstallNow;
 begin
   bucStateContext.SetApplyNow(True);
-  ChangeState(DownloadingState);
+  // A new kmshell process will be used to download
+  StartDownloadProcess;
 end;
 
 { DownloadingState }

windows/src/desktop/kmshell/main/UfrmMain.pas

@@ -839,7 +839,12 @@ procedure TfrmMain.Update_ApplyNow;
     FResult := TUtilExecute.Shell(0, ShellPath, '', '-an');
     if not FResult then
       TKeymanSentryClient.Client.MessageEvent(Sentry.Client.SENTRY_LEVEL_ERROR,
-        'TrmfMain: Shell Execute Update_ApplyNow Failed');
+        'TrmfMain: Shell Execute Update_ApplyNow Failed')
+    else
+      ModalResult := mrAbort;
+      // If a splash screen is currently open when "Install Now" is executed,
+      // setting mrAbort ensures the splash screen is closed on the
+      // return of "Keyman Configuration".
   end;
 end;
 

windows/src/desktop/kmshell/main/initprog.pas

@@ -70,7 +70,7 @@ interface
   Windows, Controls, SysUtils, Classes, ErrorControlledRegistry, Forms, MessageIdentifiers, MessageIdentifierConsts, keymanapi_TLB;
 
 procedure Run;
-procedure Main(Owner: TComponent = nil);
+function Main(Owner: TComponent = nil): TModalResult;
 
 
 type
@@ -164,10 +164,11 @@ procedure ShowKeyboardWelcome(PackageName: WideString); forward;  // I2569
 procedure PrintKeyboard(KeyboardName: WideString); forward;  // I2329
 function ProcessBackgroundUpdate(FMode: TKMShellMode; FSilent: Boolean): Boolean; forward;
 
-procedure Main(Owner: TComponent = nil);
+function Main(Owner: TComponent = nil): TModalResult;
 var
   frmMain: TfrmMain;
 begin
+  Result := mrNone;
   if not Assigned(Owner) then
   begin
     UfrmWebContainer.CreateForm(TfrmMain, frmMain);
@@ -180,7 +181,7 @@ procedure Main(Owner: TComponent = nil);
   begin
     with TfrmMain.Create(Owner) do
     try
-      ShowModal;
+      Result := ShowModal;
     finally
       Free;
     end;

windows/src/desktop/kmshell/startup/UfrmSplash.pas

@@ -63,6 +63,7 @@   TfrmSplash = class(TfrmWebContainer)
     FShowConfigurationOnLoad: Boolean;
     procedure WMUser_FormShown(var Message: TMessage); message WM_USER_FormShown;
     procedure WMUser(var Message: TMessage); message WM_USER;
+    procedure ShowConfiguration;
   protected
     procedure FireCommand(const command: WideString; params: TStringList);
       override;
@@ -112,6 +113,17 @@ procedure ShowSplash;
   end;
 end;
 
+procedure TfrmSplash.ShowConfiguration;
+var
+  configFrmResult: Integer;
+begin
+  configFrmResult := Main(Self);
+  if configFrmResult = mrAbort then
+    Command_Exit
+  else
+    Do_Content_Render;
+end;
+
 procedure TfrmSplash.TntFormActivate(Sender: TObject);
 begin
   inherited;
@@ -152,15 +164,17 @@ procedure TfrmSplash.WMUser_FormShown(var Message: TMessage);
 
   if FShowConfigurationOnLoad then
   begin
-    Main(Self);
-    Do_Content_Render;
+    ShowConfiguration;
   end;
 end;
 
 procedure TfrmSplash.FireCommand(const command: WideString; params: TStringList);
 begin
   if command = 'start' then Command_Start
-  else if command = 'config' then begin Main(Self); Do_Content_Render; end   // I4393   // I4396
+  else if command = 'config' then
+  begin
+    ShowConfiguration;
+  end   // I4393   // I4396
   else if command = 'hidesplash' then FShouldDisplay := False
   else if command = 'showsplash' then FShouldDisplay := True
   else if command = 'exit' then Command_Exit