Skip to content

Commit a121e14

Browse files
committed
Make player launch error dialog less annoying
additionally added clarification about the "don't exit to desktop app" option breaking the ability to accept player invites
1 parent 4bb623c commit a121e14

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

Bloxstrap/App.xaml.cs

-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ protected override void OnStartup(StartupEventArgs e)
218218
else
219219
{
220220
// check if user profile folder has been renamed
221-
// honestly, i'll be expecting bugs from this
222221
var match = Regex.Match(value, @"^[a-zA-Z]:\\Users\\([^\\]+)", RegexOptions.IgnoreCase);
223222

224223
if (match.Success)

Bloxstrap/Resources/Strings.Designer.cs

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Bloxstrap/Resources/Strings.resx

+5-3
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ Selecting 'No' will ignore this warning and continue installation.</value>
717717
<value>Configure additional functionality to go alongside Roblox.</value>
718718
</data>
719719
<data name="Menu.Integrations.DesktopApp.Description" xml:space="preserve">
720-
<value>Roblox will fully close when you leave a game instead of dropping you back into the app.</value>
720+
<value>Roblox will fully close when you leave a game instead of going back to the app. [Will break some things!]({0})</value>
721721
</data>
722722
<data name="Menu.Integrations.DesktopApp.Title" xml:space="preserve">
723723
<value>Don't exit to desktop app</value>
@@ -1104,7 +1104,9 @@ Are you sure you want to continue?</value>
11041104
<value>Roblox has crashed.</value>
11051105
</data>
11061106
<data name="Dialog.PlayerError.HelpInformation" xml:space="preserve">
1107-
<value>Please read the following help information, which will open in your web browser when you close this dialog.</value>
1107+
<value>For information about why this could be happening and how this can be resolved, please read [this help article]({0}).
1108+
1109+
Check if Roblox works with [the original launcher]({1}). If it doesn't, then this isn't a Bloxstrap issue. If it does, then refer to the help article.</value>
11081110
</data>
11091111
<data name="Common.NetworkError" xml:space="preserve">
11101112
<value>Could not load data because of a network error.</value>
@@ -1239,4 +1241,4 @@ Would you like to enable test mode?</value>
12391241
<data name="Dialog.Exception.Version" xml:space="preserve">
12401242
<value>Version {0}</value>
12411243
</data>
1242-
</root>
1244+
</root>

Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
77
xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
88
xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
9+
xmlns:controls="clr-namespace:Bloxstrap.UI.Elements.Controls"
910
mc:Ignorable="d"
1011
Title="Bloxstrap"
1112
d:DesignWidth="480"
@@ -33,7 +34,7 @@
3334
<ColumnDefinition Width="*" />
3435
</Grid.ColumnDefinitions>
3536
<Image x:Name="IconImage" Grid.Column="0" RenderOptions.BitmapScalingMode="HighQuality" Width="32" Height="32" Margin="0,0,15,0" VerticalAlignment="Top" />
36-
<TextBlock x:Name="MessageTextBlock" Grid.Column="1" VerticalAlignment="Center" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
37+
<controls:MarkdownTextBlock x:Name="MessageTextBlock" Grid.Column="1" VerticalAlignment="Center" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
3738
</Grid>
3839

3940
<Border Grid.Row="2" Margin="0,10,0,0" Padding="15" Background="{ui:ThemeResource SolidBackgroundFillColorSecondaryBrush}">

Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public FluentMessageBox(string message, MessageBoxImage image, MessageBoxButton
6060

6161
Title = App.ProjectName;
6262
MessageTextBlock.Text = message;
63+
MessageTextBlock.MarkdownText = message;
6364
ButtonOne.Visibility = Visibility.Collapsed;
6465
ButtonTwo.Visibility = Visibility.Collapsed;
6566
ButtonThree.Visibility = Visibility.Collapsed;

Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535

3636
<controls:OptionControl
3737
Header="{x:Static resources:Strings.Menu_Integrations_DesktopApp_Title}"
38-
Description="{x:Static resources:Strings.Menu_Integrations_DesktopApp_Description}"
38+
Description="{Binding Source={x:Static resources:Strings.Menu_Integrations_DesktopApp_Description}, Converter={StaticResource StringFormatConverter}, ConverterParameter='https://github.com/bloxstraplabs/bloxstrap/wiki/What-is-activity-tracking%3F#dont-exit-to-desktop-app'}"
39+
HelpLink="https://github.com/bloxstraplabs/bloxstrap/wiki/What-is-activity-tracking%3F#dont-exit-to-desktop-app"
3940
IsEnabled="{Binding InnerContent.IsChecked, ElementName=ActivityTrackingOption, Mode=OneWay}">
4041
<ui:ToggleSwitch IsChecked="{Binding DisableAppPatchEnabled, Mode=TwoWay}" />
4142
</controls:OptionControl>

Bloxstrap/UI/Frontend.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ public static void ShowPlayerErrorDialog(bool crash = false)
2727
if (crash)
2828
topLine = Strings.Dialog_PlayerError_Crash;
2929

30-
ShowMessageBox($"{topLine}\n\n{Strings.Dialog_PlayerError_HelpInformation}", MessageBoxImage.Error);
30+
string info = String.Format(
31+
Strings.Dialog_PlayerError_HelpInformation,
32+
$"https://github.com/{App.ProjectRepository}/wiki/Roblox-crashes-or-does-not-launch",
33+
$"https://github.com/{App.ProjectRepository}/wiki/Switching-between-Roblox-and-Bloxstrap"
34+
);
3135

32-
Utilities.ShellExecute($"https://github.com/{App.ProjectRepository}/wiki/Roblox-crashes-or-does-not-launch");
36+
ShowMessageBox($"{topLine}\n\n{info}", MessageBoxImage.Error);
3337
}
3438

3539
public static void ShowExceptionDialog(Exception exception)

0 commit comments

Comments
 (0)