mirror of
https://github.com/bloxstraplabs/bloxstrap.git
synced 2025-04-21 10:01:27 -07:00
Merge branch 'version-2.4.0' of https://github.com/pizzaboxer/bloxstrap into version-2.4.0
This commit is contained in:
commit
3422cdc74f
@ -71,16 +71,14 @@ namespace Bloxstrap
|
||||
|
||||
void FinalizeExceptionHandling(Exception exception)
|
||||
{
|
||||
#pragma warning disable 162
|
||||
#if DEBUG
|
||||
throw exception;
|
||||
#endif
|
||||
|
||||
#else
|
||||
if (!IsQuiet)
|
||||
Controls.ShowExceptionDialog(exception);
|
||||
|
||||
Terminate(ErrorCode.ERROR_INSTALL_FAILURE);
|
||||
#pragma warning restore 162
|
||||
#endif
|
||||
}
|
||||
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
|
@ -38,7 +38,7 @@
|
||||
</Grid>
|
||||
|
||||
<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>
|
||||
</Grid>
|
||||
</ui:UiWindow>
|
||||
|
Loading…
Reference in New Issue
Block a user