Compare commits

..

No commits in common. "1893e4e9085735c1fc8be3959ba1fd0da6b0ea68" and "e93f0d62a62ae71b4d338933431d4915ace71fc9" have entirely different histories.

3 changed files with 13 additions and 13 deletions

View File

@ -10,8 +10,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon> <ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.91</AssemblyVersion> <AssemblyVersion>2.90</AssemblyVersion>
<FileVersion>2.91</FileVersion> <FileVersion>2.90</FileVersion>
<Company>SPT</Company> <Company>SPT</Company>
</PropertyGroup> </PropertyGroup>

View File

@ -152,17 +152,6 @@ public class InstallPathSelectionViewModel : ViewModelBase
_data.TargetInstallPath = SelectedPath; _data.TargetInstallPath = SelectedPath;
_data.OriginalGamePath = PreCheckHelper.DetectOriginalGamePath();
#if !TEST
if (_data.OriginalGamePath == null)
{
NavigateTo(new MessageViewModel(HostScreen,
Result.FromError("Could not find where you installed EFT.\n\nDo you own and have the game installed?")));
return;
}
#endif
NavigateTo(new PreChecksViewModel(HostScreen)); NavigateTo(new PreChecksViewModel(HostScreen));
} }
} }

View File

@ -128,10 +128,21 @@ public class PreChecksViewModel : ViewModelBase
return; return;
} }
data.OriginalGamePath = PreCheckHelper.DetectOriginalGamePath();
InstallPath = data.TargetInstallPath; InstallPath = data.TargetInstallPath;
Log.Information($"Install Path: {FileHelper.GetRedactedPath(InstallPath)}"); Log.Information($"Install Path: {FileHelper.GetRedactedPath(InstallPath)}");
#if !TEST
if (data.OriginalGamePath == null)
{
NavigateTo(new MessageViewModel(HostScreen,
Result.FromError("Could not find where you installed EFT.\n\nDo you own and have the game installed?")));
return;
}
#endif
if (data.OriginalGamePath == data.TargetInstallPath) if (data.OriginalGamePath == data.TargetInstallPath)
{ {
Log.CloseAndFlush(); Log.CloseAndFlush();