diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 5af684d..16c68eb 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -51,7 +51,7 @@ namespace Bloxstrap private readonly CancellationTokenSource _cancelTokenSource = new(); - private static bool FreshInstall => String.IsNullOrEmpty(App.State.Prop.VersionGuid); + private static bool FreshInstall => String.IsNullOrEmpty(App.State.Prop.PlayerVersionGuid); private string _playerLocation => Path.Combine(_versionFolder, "RobloxPlayerBeta.exe"); @@ -183,7 +183,7 @@ namespace Bloxstrap await CheckLatestVersion(); // install/update roblox if we're running for the first time, needs updating, or the player location doesn't exist - if (App.IsFirstRun || _latestVersionGuid != App.State.Prop.VersionGuid || !File.Exists(_playerLocation)) + if (App.IsFirstRun || _latestVersionGuid != App.State.Prop.PlayerVersionGuid || !File.Exists(_playerLocation)) await InstallLatestVersion(); if (App.IsFirstRun) @@ -874,7 +874,7 @@ namespace Bloxstrap } } - string oldVersionFolder = Path.Combine(Paths.Versions, App.State.Prop.VersionGuid); + string oldVersionFolder = Path.Combine(Paths.Versions, App.State.Prop.PlayerVersionGuid); // move old compatibility flags for the old location using (RegistryKey appFlagsKey = Registry.CurrentUser.CreateSubKey($"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers")) @@ -915,7 +915,7 @@ namespace Bloxstrap } } - App.State.Prop.VersionGuid = _latestVersionGuid; + App.State.Prop.PlayerVersionGuid = _latestVersionGuid; // don't register program size until the program is registered, which will be done after this if (!App.IsFirstRun && !FreshInstall) diff --git a/Bloxstrap/Models/State.cs b/Bloxstrap/Models/State.cs index 6f1d650..af607f5 100644 --- a/Bloxstrap/Models/State.cs +++ b/Bloxstrap/Models/State.cs @@ -3,7 +3,10 @@ public class State { public string LastEnrolledChannel { get; set; } = ""; - public string VersionGuid { get; set; } = ""; + [Obsolete("Use PlayerVersionGuid", true)] + public string VersionGuid { set { PlayerVersionGuid = value; } } + public string PlayerVersionGuid { get; set; } = ""; + public string StudioVersionGuid { get; set; } = ""; public List ModManifest { get; set; } = new(); } } diff --git a/Bloxstrap/UI/ViewModels/Bootstrapper/ByfronDialogViewModel.cs b/Bloxstrap/UI/ViewModels/Bootstrapper/ByfronDialogViewModel.cs index 5f16722..ed04c64 100644 --- a/Bloxstrap/UI/ViewModels/Bootstrapper/ByfronDialogViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Bootstrapper/ByfronDialogViewModel.cs @@ -20,7 +20,7 @@ namespace Bloxstrap.UI.ViewModels.Bootstrapper { get { - string playerLocation = Path.Combine(Paths.Versions, App.State.Prop.VersionGuid, "RobloxPlayerBeta.exe"); + string playerLocation = Path.Combine(Paths.Versions, App.State.Prop.PlayerVersionGuid, "RobloxPlayerBeta.exe"); if (!File.Exists(playerLocation)) return ""; diff --git a/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs index 28c4bc7..4c34052 100644 --- a/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs @@ -108,17 +108,17 @@ public bool ForceRobloxReinstallation { - get => String.IsNullOrEmpty(App.State.Prop.VersionGuid); + get => String.IsNullOrEmpty(App.State.Prop.PlayerVersionGuid); set { if (value) { - _oldVersionGuid = App.State.Prop.VersionGuid; - App.State.Prop.VersionGuid = ""; + _oldVersionGuid = App.State.Prop.PlayerVersionGuid; + App.State.Prop.PlayerVersionGuid = ""; } else { - App.State.Prop.VersionGuid = _oldVersionGuid; + App.State.Prop.PlayerVersionGuid = _oldVersionGuid; } } }