PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Rewrite Initializer.Run so it doesn't look like a toddler made it

Browse Source
This commit is contained in:
John Gross
2019-11-10 15:59:30 -08:00
parent 28164b491b
commit 5727e3b1b8
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Torch.Server/Initializer.cs
View File

@@ -125,21 +125,14 @@ quit";
public void Run()
{
_server = new TorchServer(_config);
var init = Task.Run(() => _server.Init()).ContinueWith(x =>
if (_config.NoGui)
{
if (!x.IsFaulted)
return;
Log.Error("Error initializing server.");
LogException(x.Exception);
});
if (!_config.NoGui)
_server.Init();
_server.Start();
}
else
{
if (_config.Autostart)
init.ContinueWith(x => _server.Start());
Log.Info("Showing UI");
#if !DEBUG
if (!_config.IndependentConsole)
{
@@ -147,13 +140,19 @@ quit";
NativeMethods.FreeConsole();
}
#endif
new TorchUI(_server).ShowDialog();
}
else
{
init.Wait();
_server.Start();
var gameThread = new Thread(() =>
{
_server.Init();
if (_config.Autostart)
_server.Start();
});
gameThread.Start();
var ui = new TorchUI(_server);
ui.ShowDialog();
}
}