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

… into version-2.4.0
pizzaboxer · Jul 16, 2023 · 3422cdc · 3422cdc
2 parents 691d7be + 539d3ed
commit 3422cdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs
@@ -71,16 +71,14 @@ void GlobalExceptionHandler(object sender, DispatcherUnhandledExceptionEventArgs
 
  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)

diff --git a/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml b/Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml
@@ -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>