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

Merge pull request 'fix/catch-start-game-exceptions' (!52) from waffle.lord/Launcher:fix/catch-start-game-exceptions into master

Browse Source 
Reviewed-on: SPT/Launcher#52
This commit is contained in:
IsWaffle 2024-05-30 15:58:33 +00:00
commit 87a3932d79
8 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project/SPT.Launcher.Base/Controllers/GameStarter.cs
View File

@ -131,8 +131,17 @@ namespace SPT.Launcher
WorkingDirectory = gamePath, WorkingDirectory = gamePath,
}; };
Process.Start(clientProcess); try
LogManager.Instance.Info("[LaunchGame] Game process started"); {
Process.Start(clientProcess);
LogManager.Instance.Info("[LaunchGame] Game process started");
}
catch (Exception ex)
{
LogManager.Instance.Exception(ex);
return GameStarterResult.FromError(-7);
}
} }
return GameStarterResult.FromSuccess(); return GameStarterResult.FromSuccess();

4
project/SPT.Launcher.Base/Models/Launcher/GameStarterResult.cs
View File

@ -44,6 +44,10 @@ namespace SPT.Launcher.Models.Launcher
Message = LocalizationProvider.Instance.eft_exe_not_found_warning; Message = LocalizationProvider.Instance.eft_exe_not_found_warning;
break; break;
case -7:
Message = ":(";
break;
default: default:
Message = LocalizationProvider.Instance.login_failed; Message = LocalizationProvider.Instance.login_failed;
break; break;

BIN
project/SPT.Launcher/Assets/aki-logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
project/SPT.Launcher/Assets/icon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 420 KiB

BIN
project/SPT.Launcher/Assets/spt-logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
project/SPT.Launcher/Assets/spt-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

2
project/SPT.Launcher/SPT.Launcher.csproj
View File

@ -5,7 +5,7 @@
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract> <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon> <ApplicationIcon>Assets\spt-logo.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AvaloniaResource Include="Assets\**" /> <AvaloniaResource Include="Assets\**" />

2
project/SPT.Launcher/Views/MainWindow.axaml
View File

@ -10,7 +10,7 @@
xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia" xmlns:dialogHost="clr-namespace:DialogHost;assembly=DialogHost.Avalonia"
mc:Ignorable="d" d:DesignWidth="750" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="750" d:DesignHeight="450"
x:Class="SPT.Launcher.Views.MainWindow" x:Class="SPT.Launcher.Views.MainWindow"
Icon="/Assets/icon.ico" Icon="/Assets/spt-logo.ico"
Title="SPT.Launcher" Title="SPT.Launcher"
MinHeight="450" MinWidth="800" MinHeight="450" MinWidth="800"
Height="450" Width="800" Height="450" Width="800"