spt/launcher
spt/launcher
0
0
Fork 0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-12 22:50:44 -05:00
Code

Merge pull request 'return bool when loading server' (!31) from waffle.lord/Launcher:master into master

Browse Source 
Reviewed-on: SPT-AKI/Launcher#31
This commit is contained in:
IsWaffle 2023-12-05 15:02:41 +00:00
commit fc2a83b2e3
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
project/Aki.Launcher.Base/Controllers/ServerManager.cs
View File

@ -92,7 +92,7 @@ namespace Aki.Launcher
} }
} }
public static void LoadServer(string backendUrl) public static bool LoadServer(string backendUrl)
{ {
string json = ""; string json = "";
@ -100,22 +100,20 @@ namespace Aki.Launcher
{ {
RequestHandler.ChangeBackendUrl(backendUrl); RequestHandler.ChangeBackendUrl(backendUrl);
json = RequestHandler.RequestConnect(); json = RequestHandler.RequestConnect();
SelectedServer = Json.Deserialize<ServerInfo>(json);
} }
catch catch
{ {
SelectedServer = null; SelectedServer = null;
return; return false;
} }
SelectedServer = Json.Deserialize<ServerInfo>(json); return true;
} }
public static async Task LoadDefaultServerAsync(string server) public static async Task<bool> LoadDefaultServerAsync(string server)
{ {
await Task.Run(() => return await Task.Run(() => LoadServer(server));
{
LoadServer(server);
});
} }
} }
} }

10
project/Aki.Launcher/ViewModels/ConnectServerViewModel.cs
View File

@ -32,8 +32,14 @@ namespace Aki.Launcher.ViewModels
public async Task ConnectServer() public async Task ConnectServer()
{ {
await ServerManager.LoadDefaultServerAsync(LauncherSettingsProvider.Instance.Server.Url); if (!await ServerManager.LoadDefaultServerAsync(LauncherSettingsProvider.Instance.Server.Url))
{
connectModel.ConnectionFailed = true;
connectModel.InfoText = string.Format(LocalizationProvider.Instance.server_unavailable_format_1,
LauncherSettingsProvider.Instance.Server.Name);
return;
}
bool connected = ServerManager.PingServer(); bool connected = ServerManager.PingServer();
connectModel.ConnectionFailed = !connected; connectModel.ConnectionFailed = !connected;