mirror of
https://github.com/sp-tarkov/launcher.git
synced 2025-02-12 16:50:43 -05:00
Merge pull request 'fix/catch-start-game-exceptions' (!52) from waffle.lord/Launcher:fix/catch-start-game-exceptions into master
Reviewed-on: SPT/Launcher#52
This commit is contained in:
commit
87a3932d79
@ -131,8 +131,17 @@ namespace SPT.Launcher
|
||||
WorkingDirectory = gamePath,
|
||||
};
|
||||
|
||||
Process.Start(clientProcess);
|
||||
LogManager.Instance.Info("[LaunchGame] Game process started");
|
||||
try
|
||||
{
|
||||
|
||||
Process.Start(clientProcess);
|
||||
LogManager.Instance.Info("[LaunchGame] Game process started");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogManager.Instance.Exception(ex);
|
||||
return GameStarterResult.FromError(-7);
|
||||
}
|
||||
}
|
||||
|
||||
return GameStarterResult.FromSuccess();
|
||||
|
@ -43,6 +43,10 @@ namespace SPT.Launcher.Models.Launcher
|
||||
case -6:
|
||||
Message = LocalizationProvider.Instance.eft_exe_not_found_warning;
|
||||
break;
|
||||
|
||||
case -7:
|
||||
Message = ":(";
|
||||
break;
|
||||
|
||||
default:
|
||||
Message = LocalizationProvider.Instance.login_failed;
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 42 KiB |
Binary file not shown.
Before Width: | Height: | Size: 420 KiB |
BIN
project/SPT.Launcher/Assets/spt-logo.ico
Normal file
BIN
project/SPT.Launcher/Assets/spt-logo.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.3 KiB |
BIN
project/SPT.Launcher/Assets/spt-logo.png
Normal file
BIN
project/SPT.Launcher/Assets/spt-logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
@ -5,7 +5,7 @@
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
|
||||
<Nullable>enable</Nullable>
|
||||
<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
|
||||
<ApplicationIcon>Assets\spt-logo.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<AvaloniaResource Include="Assets\**" />
|
||||
|
@ -10,7 +10,7 @@
|
||||
xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
|
||||
mc:Ignorable="d" d:DesignWidth="750" d:DesignHeight="450"
|
||||
x:Class="SPT.Launcher.Views.MainWindow"
|
||||
Icon="/Assets/icon.ico"
|
||||
Icon="/Assets/spt-logo.ico"
|
||||
Title="SPT.Launcher"
|
||||
MinHeight="450" MinWidth="800"
|
||||
Height="450" Width="800"
|
||||
|
Loading…
x
Reference in New Issue
Block a user