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

Merge branch 'version-2.4.0' of https://github.com/pizzaboxer/bloxstrap into version-2.4.0

Browse Source
This commit is contained in:
pizzaboxer 2023-07-16 14:48:03 +01:00
commit 3422cdc74f
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bloxstrap/App.xaml.cs
View File

@ -71,16 +71,14 @@ namespace Bloxstrap
void FinalizeExceptionHandling(Exception exception) void FinalizeExceptionHandling(Exception exception)
{ {
#pragma warning disable 162
#if DEBUG #if DEBUG
throw exception; throw exception;
#endif #else
if (!IsQuiet) if (!IsQuiet)
Controls.ShowExceptionDialog(exception); Controls.ShowExceptionDialog(exception);
Terminate(ErrorCode.ERROR_INSTALL_FAILURE); Terminate(ErrorCode.ERROR_INSTALL_FAILURE);
#pragma warning restore 162 #endif
} }
protected override void OnStartup(StartupEventArgs e) protected override void OnStartup(StartupEventArgs e)

2
Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml
View File

@ -38,7 +38,7 @@
</Grid> </Grid>
<Border Grid.Row="2" Padding="15" Background="{ui:ThemeResource SolidBackgroundFillColorSecondaryBrush}"> <Border Grid.Row="2" Padding="15" Background="{ui:ThemeResource SolidBackgroundFillColorSecondaryBrush}">
<Button Margin="0" Content="Cancel" Width="120" HorizontalAlignment="Right" IsEnabled="{Binding CancelButtonEnabled, Mode=OneWay}" Command="{Binding CancelInstallCommand}" /> <Button Margin="0" Content="Cancel" Width="120" HorizontalAlignment="Right" IsEnabled="{Binding CancelEnabled, Mode=OneWay}" Command="{Binding CancelInstallCommand}" />
</Border> </Border>
</Grid> </Grid>
</ui:UiWindow> </ui:UiWindow>