From 90b57d82f4cacbe65019c22804bfec4ec21ea711 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Sun, 10 Nov 2019 01:00:37 +0000
Subject: [PATCH] [installer] Change "swift is still running" to simply wait
 until swift has quit

---
 installer/installbuilder/project.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index d85164966..0055717f1 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -27,15 +27,16 @@
         <actionDefinition>
             <name>checkForRunningSwift</name>
             <actionList>
-                <validatedActionGroup>
-                    <explanation>Check that no swift applications running</explanation>
-                    <text>It seems that some swift application is still in use,
-please close it and click Retry.</text>
-                    <severity>warning</severity>
+                <showProgressDialog>
+                    <title>Waiting for swift to be closed</title>
                     <actionList>
-                        <throwError>
-                            <text>Swift is still running. User aborted installation.</text>
-                            <ruleList>
+                        <while>
+                            <progressText>It seems that some swift application is still in use.
+It must be closed before the installation can proceed</progressText>
+                            <actionList>
+                                <wait><ms>50</ms></wait>
+                            </actionList>
+                            <conditionRuleList>
                                 <ruleGroup>
                                     <ruleEvaluationLogic>or</ruleEvaluationLogic>
                                     <ruleList>
@@ -60,10 +61,10 @@ please close it and click Retry.</text>
                                 <platformTest>
                                     <type>windows</type>
                                 </platformTest>
-                            </ruleList>
-                        </throwError>
+                            </conditionRuleList>
+                        </while>
                     </actionList>
-                </validatedActionGroup>
+                </showProgressDialog>
             </actionList>
         </actionDefinition>
         <actionDefinition>