浏览代码

Bug fix: Wrong message shown in an installer when it cannot continue because previous installation/uninstallation was not completed.

Source commit: 1e6047c159047982b7f84e36859f9069b493a081
Martin Prikryl 9 年之前
父节点
当前提交
cb713d1c57
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      deployment/winscpsetup.iss

+ 8 - 2
deployment/winscpsetup.iss

@@ -540,6 +540,11 @@ begin
   ShellExec('open', Url, '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
   ShellExec('open', Url, '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
 end;
 end;
 
 
+function IsRestartingApplicationsPage: Boolean;
+begin
+  Result := WizardForm.PreparingMemo.Visible;
+end;
+
 procedure OpenHelp;
 procedure OpenHelp;
 begin
 begin
   OpenBrowser('{#WebDocumentation}installation?page=' + IntToStr(WizardForm.CurPageID) + '&' + ExpandConstant('{#WebArguments}'));
   OpenBrowser('{#WebDocumentation}installation?page=' + IntToStr(WizardForm.CurPageID) + '&' + ExpandConstant('{#WebArguments}'));
@@ -1233,8 +1238,9 @@ begin
     else
     else
   if CurPageID = wpPreparing then
   if CurPageID = wpPreparing then
   begin
   begin
-    // Are we at the "Restart applications?" screen
-    if WizardForm.PreparingLabel.Visible then
+    // Are we at the "Restart applications?" screen.
+    // If PreparingMemo is hidden, it's "installation/removal was not completed" screen
+    if IsRestartingApplicationsPage then
     begin
     begin
       WizardForm.PreparingLabel.Caption :=
       WizardForm.PreparingLabel.Caption :=
         CustomMessage('ApplicationsFoundDragExt');
         CustomMessage('ApplicationsFoundDragExt');