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

Merge branch 'master' into 3.9.0-DEV

Browse Source
This commit is contained in:
chomp 2024-05-21 17:54:15 +00:00
commit 517865b000
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project/Aki.Launcher.Base/Helpers/LauncherSettingsProvider.cs
View File

@ -30,6 +30,7 @@ namespace Aki.Launcher.Helpers
public void SaveSettings() public void SaveSettings()
{ {
Server.Url = Path.TrimEndingDirectorySeparator(Server.Url);
Json.SaveWithFormatting(LauncherSettingsProvider.DefaultSettingsFileLocation, this, Formatting.Indented); Json.SaveWithFormatting(LauncherSettingsProvider.DefaultSettingsFileLocation, this, Formatting.Indented);
} }

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

@ -33,11 +33,15 @@ namespace Aki.Launcher.ViewModels
public async Task ConnectServer() public async Task ConnectServer()
{ {
LauncherSettingsProvider.Instance.AllowSettings = false;
if (!await ServerManager.LoadDefaultServerAsync(LauncherSettingsProvider.Instance.Server.Url)) if (!await ServerManager.LoadDefaultServerAsync(LauncherSettingsProvider.Instance.Server.Url))
{ {
connectModel.ConnectionFailed = true; connectModel.ConnectionFailed = true;
connectModel.InfoText = string.Format(LocalizationProvider.Instance.server_unavailable_format_1, connectModel.InfoText = string.Format(LocalizationProvider.Instance.server_unavailable_format_1,
LauncherSettingsProvider.Instance.Server.Name); LauncherSettingsProvider.Instance.Server.Name);
LauncherSettingsProvider.Instance.AllowSettings = true;
return; return;
} }
@ -57,6 +61,8 @@ namespace Aki.Launcher.ViewModels
NavigateTo(new LoginViewModel(HostScreen, noAutoLogin)); NavigateTo(new LoginViewModel(HostScreen, noAutoLogin));
} }
LauncherSettingsProvider.Instance.AllowSettings = true;
} }
public void RetryCommand() public void RetryCommand()