From 086c7d7674c9c237e3875b6af9092a5c2d01a893 Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Tue, 23 Jul 2024 18:08:15 -0400
Subject: [PATCH] move check, version bump

---
 SPTInstaller/SPTInstaller.csproj                      |  4 ++--
 .../ViewModels/InstallPathSelectionViewModel.cs       | 11 +++++++++++
 SPTInstaller/ViewModels/PreChecksViewModel.cs         | 11 -----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/SPTInstaller/SPTInstaller.csproj b/SPTInstaller/SPTInstaller.csproj
index 049d1d3..360be56 100644
--- a/SPTInstaller/SPTInstaller.csproj
+++ b/SPTInstaller/SPTInstaller.csproj
@@ -10,8 +10,8 @@
         <PackageIcon>icon.ico</PackageIcon>
         <ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon>
         <Configurations>Debug;Release;TEST</Configurations>
-        <AssemblyVersion>2.90</AssemblyVersion>
-        <FileVersion>2.90</FileVersion>
+        <AssemblyVersion>2.91</AssemblyVersion>
+        <FileVersion>2.91</FileVersion>
         <Company>SPT</Company>
     </PropertyGroup>
 
diff --git a/SPTInstaller/ViewModels/InstallPathSelectionViewModel.cs b/SPTInstaller/ViewModels/InstallPathSelectionViewModel.cs
index 1c08794..bcd0d57 100644
--- a/SPTInstaller/ViewModels/InstallPathSelectionViewModel.cs
+++ b/SPTInstaller/ViewModels/InstallPathSelectionViewModel.cs
@@ -152,6 +152,17 @@ public class InstallPathSelectionViewModel : ViewModelBase
         
         _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));
     }
 }
\ No newline at end of file
diff --git a/SPTInstaller/ViewModels/PreChecksViewModel.cs b/SPTInstaller/ViewModels/PreChecksViewModel.cs
index ec84d0a..b09ebc6 100644
--- a/SPTInstaller/ViewModels/PreChecksViewModel.cs
+++ b/SPTInstaller/ViewModels/PreChecksViewModel.cs
@@ -128,21 +128,10 @@ public class PreChecksViewModel : ViewModelBase
             return;
         }
         
-        data.OriginalGamePath = PreCheckHelper.DetectOriginalGamePath();
-        
         InstallPath = data.TargetInstallPath;
         
         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)
         {
             Log.CloseAndFlush();