SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

create studio guid property

Browse Source
This commit is contained in:
bluepilledgreat 2023-10-04 10:39:21 +01:00
parent 5649b464e9
commit a70ed1aead
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Bloxstrap/Bootstrapper.cs
View File

@ -51,7 +51,7 @@ namespace Bloxstrap
private readonly CancellationTokenSource _cancelTokenSource = new(); 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"); private string _playerLocation => Path.Combine(_versionFolder, "RobloxPlayerBeta.exe");
@ -183,7 +183,7 @@ namespace Bloxstrap
await CheckLatestVersion(); await CheckLatestVersion();
// install/update roblox if we're running for the first time, needs updating, or the player location doesn't exist // 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(); await InstallLatestVersion();
if (App.IsFirstRun) 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 // move old compatibility flags for the old location
using (RegistryKey appFlagsKey = Registry.CurrentUser.CreateSubKey($"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers")) 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 // don't register program size until the program is registered, which will be done after this
if (!App.IsFirstRun && !FreshInstall) if (!App.IsFirstRun && !FreshInstall)

5
Bloxstrap/Models/State.cs
View File

@ -3,7 +3,10 @@
public class State public class State
{ {
public string LastEnrolledChannel { get; set; } = ""; 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<string> ModManifest { get; set; } = new(); public List<string> ModManifest { get; set; } = new();
} }
} }

2
Bloxstrap/UI/ViewModels/Bootstrapper/ByfronDialogViewModel.cs
View File

@ -20,7 +20,7 @@ namespace Bloxstrap.UI.ViewModels.Bootstrapper
{ {
get 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)) if (!File.Exists(playerLocation))
return ""; return "";

8
Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs
View File

@ -108,17 +108,17 @@
public bool ForceRobloxReinstallation public bool ForceRobloxReinstallation
{ {
get => String.IsNullOrEmpty(App.State.Prop.VersionGuid); get => String.IsNullOrEmpty(App.State.Prop.PlayerVersionGuid);
set set
{ {
if (value) if (value)
{ {
_oldVersionGuid = App.State.Prop.VersionGuid; _oldVersionGuid = App.State.Prop.PlayerVersionGuid;
App.State.Prop.VersionGuid = ""; App.State.Prop.PlayerVersionGuid = "";
} }
else else
{ {
App.State.Prop.VersionGuid = _oldVersionGuid; App.State.Prop.PlayerVersionGuid = _oldVersionGuid;
} }
} }
} }