Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Launching the client closes the launcher now.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-07-30 00:55:54 +02:00
parent ad695702ac
commit dc6e65559b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SS14.Launcher/Program.cs
View File

@@ -10,6 +10,7 @@ using Content.Client.Utility;
using JetBrains.Annotations; using JetBrains.Annotations;
using Newtonsoft.Json; using Newtonsoft.Json;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Interfaces;
using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Interfaces.UserInterface; using Robust.Client.Interfaces.UserInterface;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
@@ -43,6 +44,7 @@ namespace SS14.Launcher
[Dependency] private readonly ITaskManager _taskManager; [Dependency] private readonly ITaskManager _taskManager;
[Dependency] private readonly IUriOpener _uriOpener; [Dependency] private readonly IUriOpener _uriOpener;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
[Dependency] private readonly IGameController _gameController;
#pragma warning restore 649 #pragma warning restore 649
public static void Main(string[] args) public static void Main(string[] args)
@@ -93,7 +95,11 @@ namespace SS14.Launcher
_interface.StatusLabel.Text = _loc.GetString("Ready!"); _interface.StatusLabel.Text = _loc.GetString("Ready!");
_interface.LaunchButton.Disabled = false; _interface.LaunchButton.Disabled = false;
_interface.LaunchButton.OnPressed += _ => LaunchClient(); _interface.LaunchButton.OnPressed += _ =>
{
LaunchClient();
_gameController.Shutdown();
};
} }
catch (Exception e) catch (Exception e)
{ {