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

Fix a few remaining things

Browse Source
This commit is contained in:
pizzaboxer 2024-09-09 12:12:51 +01:00
parent 7a0f50bd81
commit ff387cfc59
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bloxstrap/Installer.cs
View File

@ -162,11 +162,12 @@ namespace Bloxstrap
const string LOG_IDENT = "Installer::DoUninstall"; const string LOG_IDENT = "Installer::DoUninstall";
var processes = new List<Process>(); var processes = new List<Process>();
processes.AddRange(Process.GetProcessesByName(App.RobloxPlayerAppName));
#if STUDIO_FEATURES if (!String.IsNullOrEmpty(App.State.Prop.Player.VersionGuid))
processes.AddRange(Process.GetProcessesByName(App.RobloxStudioAppName)); processes.AddRange(Process.GetProcessesByName(App.RobloxPlayerAppName));
#endif
if (!String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid))
processes.AddRange(Process.GetProcessesByName(App.RobloxStudioAppName));
// prompt to shutdown roblox if its currently running // prompt to shutdown roblox if its currently running
if (processes.Any()) if (processes.Any())
@ -179,7 +180,10 @@ namespace Bloxstrap
); );
if (result != MessageBoxResult.OK) if (result != MessageBoxResult.OK)
{
App.Terminate(ErrorCode.ERROR_CANCELLED); App.Terminate(ErrorCode.ERROR_CANCELLED);
return;
}
try try
{ {

8
Bloxstrap/LaunchHandler.cs
View File

@ -1,6 +1,5 @@
using System.Windows; using System.Windows;
using Microsoft.Win32;
using Windows.Win32; using Windows.Win32;
using Windows.Win32.Foundation; using Windows.Win32.Foundation;
@ -43,6 +42,8 @@ namespace Bloxstrap
LaunchRoblox(); LaunchRoblox();
else if (!App.LaunchSettings.QuietFlag.Active) else if (!App.LaunchSettings.QuietFlag.Active)
LaunchMenu(); LaunchMenu();
else
App.Terminate();
} }
public static void LaunchInstaller() public static void LaunchInstaller()
@ -52,6 +53,7 @@ namespace Bloxstrap
if (!interlock.IsAcquired) if (!interlock.IsAcquired)
{ {
Frontend.ShowMessageBox(Strings.Dialog_AlreadyRunning_Installer, MessageBoxImage.Stop); Frontend.ShowMessageBox(Strings.Dialog_AlreadyRunning_Installer, MessageBoxImage.Stop);
App.Terminate();
return; return;
} }
@ -96,6 +98,7 @@ namespace Bloxstrap
if (!interlock.IsAcquired) if (!interlock.IsAcquired)
{ {
Frontend.ShowMessageBox(Strings.Dialog_AlreadyRunning_Uninstaller, MessageBoxImage.Stop); Frontend.ShowMessageBox(Strings.Dialog_AlreadyRunning_Uninstaller, MessageBoxImage.Stop);
App.Terminate();
return; return;
} }
@ -116,7 +119,10 @@ namespace Bloxstrap
} }
if (!confirmed) if (!confirmed)
{
App.Terminate();
return; return;
}
Installer.DoUninstall(keepData); Installer.DoUninstall(keepData);

2
Bloxstrap/UI/Elements/Dialogs/ConnectivityDialog.xaml
View File

@ -32,7 +32,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image x:Name="IconImage" Grid.Column="0" Width="32" Height="32" Margin="0,0,15,0" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality" Source="pack://application:,,,/Resources/MessageBox/Error.png" /> <Image x:Name="IconImage" Grid.Column="0" Width="32" Height="32" Margin="0,0,15,0" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality" Source="pack://application:,,,/Resources/MessageBox/Error.png" />
<StackPanel Grid.Column="1"> <StackPanel Grid.Column="1">
<TextBlock x:Name="TitleTextBlock" Text="? is unable to connect to ?" FontSize="18" Foreground="{DynamicResource TextFillColorPrimaryBrush}" /> <TextBlock x:Name="TitleTextBlock" Text="? is unable to connect to ?" FontSize="18" Foreground="{DynamicResource TextFillColorPrimaryBrush}" TextWrapping="Wrap" />
<controls:MarkdownTextBlock x:Name="DescriptionTextBlock" MarkdownText="?" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" /> <controls:MarkdownTextBlock x:Name="DescriptionTextBlock" MarkdownText="?" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
<TextBlock Text="{x:Static resources:Strings.Dialog_Connectivity_MoreInfo}" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" /> <TextBlock Text="{x:Static resources:Strings.Dialog_Connectivity_MoreInfo}" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
<RichTextBox x:Name="ErrorRichTextBox" Padding="8" Margin="0,8,0,0" Block.LineHeight="2" FontFamily="Courier New" IsReadOnly="True" /> <RichTextBox x:Name="ErrorRichTextBox" Padding="8" Margin="0,8,0,0" Block.LineHeight="2" FontFamily="Courier New" IsReadOnly="True" />

2
Bloxstrap/UI/Elements/Dialogs/ExceptionDialog.xaml
View File

@ -33,7 +33,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image Grid.Column="0" Width="32" Height="32" Margin="0,0,15,0" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality" Source="pack://application:,,,/Resources/MessageBox/Error.png" /> <Image Grid.Column="0" Width="32" Height="32" Margin="0,0,15,0" VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality" Source="pack://application:,,,/Resources/MessageBox/Error.png" />
<StackPanel Grid.Column="1"> <StackPanel Grid.Column="1">
<TextBlock Text="{x:Static resources:Strings.Dialog_Exception_Info_1}" FontSize="18" Foreground="{DynamicResource TextFillColorPrimaryBrush}" /> <TextBlock Text="{x:Static resources:Strings.Dialog_Exception_Info_1}" FontSize="18" Foreground="{DynamicResource TextFillColorPrimaryBrush}" TextWrapping="Wrap" />
<RichTextBox x:Name="ErrorRichTextBox" Padding="8" Margin="0,16,0,0" Block.LineHeight="2" FontFamily="Courier New" IsReadOnly="True" /> <RichTextBox x:Name="ErrorRichTextBox" Padding="8" Margin="0,16,0,0" Block.LineHeight="2" FontFamily="Courier New" IsReadOnly="True" />
<controls:MarkdownTextBlock x:Name="HelpMessageMDTextBlock" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" /> <controls:MarkdownTextBlock x:Name="HelpMessageMDTextBlock" Margin="0,16,0,0" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
</StackPanel> </StackPanel>