Merge pull request 'update game check' (#46) from waffle.lord/SPT-AKI-Installer:fix/game-check into master

Reviewed-on: CWX/SPT-AKI-Installer#46
This commit is contained in:
IsWaffle 2023-12-19 19:59:09 +00:00
commit f05e11a6eb
2 changed files with 6 additions and 6 deletions

View File

@ -16,17 +16,17 @@ public static class PreCheckHelper
return null; return null;
var uninstallStringValue = Registry.LocalMachine.OpenSubKey(registryInstall, false) var uninstallStringValue = Registry.LocalMachine.OpenSubKey(registryInstall, false)
?.GetValue("UninstallString"); ?.GetValue("InstallLocation");
var info = (uninstallStringValue is string key) ? new FileInfo(key) : null; var info = (uninstallStringValue is string key) ? new DirectoryInfo(key) : null;
return info?.DirectoryName; return info?.FullName;
} }
public static Result DetectOriginalGameVersion(string gamePath) public static Result DetectOriginalGameVersion(string gamePath)
{ {
try try
{ {
string version = FileVersionInfo.GetVersionInfo(Path.Join(gamePath + "/EscapeFromTarkov.exe")).ProductVersion.Replace('-', '.').Split('.')[^2]; string version = FileVersionInfo.GetVersionInfo(Path.Join(gamePath, "/EscapeFromTarkov.exe")).ProductVersion.Replace('-', '.').Split('.')[^2];
return Result.FromSuccess(version); return Result.FromSuccess(version);
} }
catch (Exception ex) catch (Exception ex)

View File

@ -9,8 +9,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon> <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.24</AssemblyVersion> <AssemblyVersion>2.25</AssemblyVersion>
<FileVersion>2.24</FileVersion> <FileVersion>2.25</FileVersion>
<Company>SPT-AKI</Company> <Company>SPT-AKI</Company>
</PropertyGroup> </PropertyGroup>