From acc8b67c87c0a2ad1f5751ff86811a285f3f330e Mon Sep 17 00:00:00 2001 From: bluepilledgreat <97983689+bluepilledgreat@users.noreply.github.com> Date: Wed, 16 Oct 2024 21:32:11 +0100 Subject: [PATCH] add App.IsStudioVisible --- Bloxstrap/App.xaml.cs | 2 ++ Bloxstrap/Installer.cs | 4 ++-- Bloxstrap/UI/ViewModels/Dialogs/LaunchMenuViewModel.cs | 2 +- Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index ce40e07..cfc86ab 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -39,6 +39,8 @@ namespace Bloxstrap public static bool IsProductionBuild => IsActionBuild && BuildMetadata.CommitRef.StartsWith("tag", StringComparison.Ordinal); + public static bool IsStudioVisible => !String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid); + public static readonly MD5 MD5Provider = MD5.Create(); public static readonly Logger Logger = new(); diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs index e9a4045..10bb781 100644 --- a/Bloxstrap/Installer.cs +++ b/Bloxstrap/Installer.cs @@ -91,7 +91,7 @@ namespace Bloxstrap App.Settings.Prop.EnableAnalytics = EnableAnalytics; - if (!String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid)) + if (App.IsStudioVisible) WindowsRegistry.RegisterStudio(); App.Settings.Save(); @@ -190,7 +190,7 @@ namespace Bloxstrap if (!String.IsNullOrEmpty(App.State.Prop.Player.VersionGuid)) processes.AddRange(Process.GetProcessesByName(App.RobloxPlayerAppName)); - if (!String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid)) + if (App.IsStudioVisible) processes.AddRange(Process.GetProcessesByName(App.RobloxStudioAppName)); // prompt to shutdown roblox if its currently running diff --git a/Bloxstrap/UI/ViewModels/Dialogs/LaunchMenuViewModel.cs b/Bloxstrap/UI/ViewModels/Dialogs/LaunchMenuViewModel.cs index 951f816..915923e 100644 --- a/Bloxstrap/UI/ViewModels/Dialogs/LaunchMenuViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Dialogs/LaunchMenuViewModel.cs @@ -10,7 +10,7 @@ namespace Bloxstrap.UI.ViewModels.Installer { public string Version => string.Format(Strings.Menu_About_Version, App.Version); - public Visibility ShowRobloxStudioOption => String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid) ? Visibility.Collapsed : Visibility.Visible; + public Visibility ShowRobloxStudioOption => App.IsStudioVisible ? Visibility.Visible : Visibility.Collapsed; public ICommand LaunchSettingsCommand => new RelayCommand(LaunchSettings); diff --git a/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs index 6e7f588..caef426 100644 --- a/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/ShortcutsViewModel.cs @@ -2,7 +2,7 @@ { public class ShortcutsViewModel : NotifyPropertyChangedViewModel { - public bool IsStudioOptionVisible => !String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid); + public bool IsStudioOptionVisible => App.IsStudioVisible; public ShortcutTask DesktopIconTask { get; } = new("Desktop", Paths.Desktop, $"{App.ProjectName}.lnk");