Other: Tweak the dialog service so dialogs report closing whether con…

…firmed or cancelled.
deanthecoder · Jan 21, 2024 · 4442fdc · 4442fdc
1 parent af8a406
commit 4442fdc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Speculator/CSharp.Utils/UI/DialogService.cs b/Speculator/CSharp.Utils/UI/DialogService.cs
@@ -19,7 +19,7 @@ public class DialogService
 {
     public static DialogService Instance { get; } = new DialogService();
 
-    public void Warn(string message, string detail, string cancelButton, string actionButton, Action action, MaterialIconKind? icon = null)
+    public void Warn(string message, string detail, string cancelButton, string actionButton, Action<bool> onClose, MaterialIconKind? icon = null)
     {
         DialogHost.Show(new ConfirmationDialog
             {
@@ -30,10 +30,6 @@ public void Warn(string message, string detail, string cancelButton, string acti
                 ActionBrush = Brushes.Red,
                 Icon = icon
             },
-            (_, args) =>
-            {
-                if (Convert.ToBoolean(args.Parameter))
-                    action();
-            });
+            (_, args) => onClose(Convert.ToBoolean(args.Parameter)));
     }
 }
diff --git a/Speculator/Speculator/ViewModels/MainWindowViewModel.cs b/Speculator/Speculator/ViewModels/MainWindowViewModel.cs
@@ -93,14 +93,18 @@ public void SaveRom()
         command.Cancelled += (_, _) => keyBlocker.Dispose();
         command.Execute(null);
     }
-    
+
     public void ResetMachine() =>
         DialogService.Instance.Warn(
             "Reset Emulator?",
             "This will simulate a restart of the ZX Spectrum.",
             "CANCEL",
             "RESET",
-            () => Speccy.TheCpu.ResetAsync(),
+            confirmed =>
+            {
+                if (confirmed)
+                    Speccy.TheCpu.ResetAsync();
+            },
             MaterialIconKind.Power);
 
     public void SetCursorJoystick(bool b) =>