From b0a1045f74f5205fd99f4ba47749b64d4bafa6e1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 26 Aug 2017 13:39:53 -0400 Subject: [PATCH] Prompts to kill running interfaces are now shown at the beginning of installation --- TGInstallerWrapper/Main.cs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/TGInstallerWrapper/Main.cs b/TGInstallerWrapper/Main.cs index 09f1b8243b..0372aa7204 100644 --- a/TGInstallerWrapper/Main.cs +++ b/TGInstallerWrapper/Main.cs @@ -68,6 +68,21 @@ namespace TGInstallerWrapper string logfile = null; try { + while (true) + { + var res = PromptKillProcess("TGCommandLine"); + if (res == PKillType.Aborted) + return; + else if (res == PKillType.Killed) + continue; + res = PromptKillProcess("TGControlPanel"); + if (res == PKillType.Aborted) + return; + else if (res == PKillType.Killed) + continue; + break; + } + var args = new List(); if (!pathIsDefault) args.Add(String.Format("INSTALLFOLDER=\"{0}\"", PathTextBox.Text)); @@ -114,21 +129,6 @@ namespace TGInstallerWrapper } } - while (true) - { - var res = PromptKillProcess("TGCommandLine"); - if (res == PKillType.Aborted) - return; - else if (res == PKillType.Killed) - continue; - res = PromptKillProcess("TGControlPanel"); - if (res == PKillType.Aborted) - return; - else if (res == PKillType.Killed) - continue; - break; - } - InstallCancelButton.Enabled = true; if (ShowLogCheckbox.Checked)