cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-24 21:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #142 from tgstation/Cyberboss-patch-1

Browse Source 
Prompts to kill running interfaces are now shown at the beginning of installation
This commit is contained in:
Jordan Brown
2017-08-31 14:13:17 -04:00
committed by GitHub
parent f920c65eed b0a1045f74
commit 4c75d172ee
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGInstallerWrapper/Main.cs
+15 -15
View File
@@ -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<string>();
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)