From 9f67f1a9997c54ab1a654c54cc9d976696ab598e Mon Sep 17 00:00:00 2001 From: marona Date: Sat, 21 Dec 2024 01:09:36 +0900 Subject: [PATCH] Fix not recognized the patch if LIVE folder is not existed --- SCTools/SCTool_Redesigned/App.xaml.cs | 4 ++-- SCTools/SCTool_Redesigned/Pages/selectDir.xaml.cs | 2 +- SCTools/SCTool_Redesigned/Properties/AssemblyInfo.cs | 4 ++-- SCTools/SCTool_Redesigned/Windows/MainWindow.xaml.cs | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/SCTools/SCTool_Redesigned/App.xaml.cs b/SCTools/SCTool_Redesigned/App.xaml.cs index a8488f5..7c37dff 100644 --- a/SCTools/SCTool_Redesigned/App.xaml.cs +++ b/SCTools/SCTool_Redesigned/App.xaml.cs @@ -71,7 +71,7 @@ private static AppSettings GetAppSettings() if (executableDir == null || LocalappDir == null) { - throw new NullReferenceException("Dirctory path is empty"); + throw new NullReferenceException("Directory path is empty"); } //_appSettings = JsonHelper.ReadFile(Path.Combine(executableDir, AppSettingsFileName)) ?? new AppSettings(); @@ -88,7 +88,7 @@ public static bool SaveAppSettings(AppSettings settings) if (executableDir == null || LocalappDir == null) { - throw new NullReferenceException("Dirctory path is empty"); + throw new NullReferenceException("Directory path is empty"); } if (Directory.Exists(LocalappDir)) diff --git a/SCTools/SCTool_Redesigned/Pages/selectDir.xaml.cs b/SCTools/SCTool_Redesigned/Pages/selectDir.xaml.cs index 2663059..a1b36c9 100644 --- a/SCTools/SCTool_Redesigned/Pages/selectDir.xaml.cs +++ b/SCTools/SCTool_Redesigned/Pages/selectDir.xaml.cs @@ -37,7 +37,7 @@ private string getDir() string infofile = App.LocalappDir + "build.info"; if (!File.Exists(infofile)) { - App.Logger.Warn("StarCitizeen build info File does not exist. Maybe not installed?"); + App.Logger.Warn("StarCitizen build info File does not exist. Maybe not installed?"); throw new FileNotFoundException("build.info"); } string[] _buildinfo = File.ReadAllLines(infofile); diff --git a/SCTools/SCTool_Redesigned/Properties/AssemblyInfo.cs b/SCTools/SCTool_Redesigned/Properties/AssemblyInfo.cs index 4f6a07a..8dc405f 100644 --- a/SCTools/SCTool_Redesigned/Properties/AssemblyInfo.cs +++ b/SCTools/SCTool_Redesigned/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.4.4")] -[assembly: AssemblyFileVersion("1.3.4.4")] +[assembly: AssemblyVersion("1.3.4.5")] +[assembly: AssemblyFileVersion("1.3.4.5")] diff --git a/SCTools/SCTool_Redesigned/Windows/MainWindow.xaml.cs b/SCTools/SCTool_Redesigned/Windows/MainWindow.xaml.cs index 3b4cc7a..ba05d9d 100644 --- a/SCTools/SCTool_Redesigned/Windows/MainWindow.xaml.cs +++ b/SCTools/SCTool_Redesigned/Windows/MainWindow.xaml.cs @@ -556,7 +556,8 @@ private void SetInstallbtnLabel() ++isNewVersion; } - var gameFolder = Path.Combine(App.Settings.GameFolder, mode.ToString()); + //var gameFolder = Path.Combine(App.Settings.GameFolder, mode.ToString()); + var gameFolder = Path.Combine(App.Settings.GameFolder, "4.0_PREVIEW"); var localizationFile = Path.Combine(gameFolder, "data", "Localization", App.Settings.GetOfficialLanauages()[App.Settings.GameLanguage], "global.ini"); var userConfigPath = Path.Combine(gameFolder, "user.cfg"); @@ -636,7 +637,8 @@ private bool IsLocalizationInstalled() { var patch = data.Installations.FirstOrDefault(); - var gameFolder = Path.Combine(App.Settings.GameFolder, mode.ToString()); + //var gameFolder = Path.Combine(App.Settings.GameFolder, mode.ToString()); + var gameFolder = Path.Combine(App.Settings.GameFolder, "4.0_PREVIEW"); var localizationFile = Path.Combine(gameFolder, "data", "Localization", App.Settings.GetOfficialLanauages()[App.Settings.GameLanguage], "global.ini"); var userConfigPath = Path.Combine(gameFolder, "user.cfg");