fix: onSure is not asigned to Views.Confirm.OnSure

Signed-off-by: leo <[email protected]>

Author: love-linger

src/App.axaml.cs

@@ -148,10 +148,19 @@ public static void ShowWindow(object data, bool showAsDialog)
 
         public static async Task<bool> AskConfirmAsync(string message, Action onSure)
         {
+            if (!Dispatcher.UIThread.CheckAccess())
+            {
+                return await Dispatcher.UIThread.InvokeAsync<bool>(async () =>
+                {
+                    return await AskConfirmAsync(message, onSure);
+                });
+            }
+
             if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
             {
                 var confirm = new Views.Confirm();
                 confirm.Message.Text = message;
+                confirm.OnSure = onSure;
                 return await confirm.ShowDialog<bool>(owner);
             }
 

src/ViewModels/Checkout.cs

@@ -45,7 +45,7 @@ public override async Task<bool> Sure()
             var succ = false;
             var needPopStash = false;
 
-            var confirmed = await _repo.ConfirmCheckoutBranchAsync().ConfigureAwait(false);
+            var confirmed = await _repo.ConfirmCheckoutBranchAsync();
             if (!confirmed)
             {
                 _repo.SetWatcherEnabled(true);

src/ViewModels/CheckoutAndFastForward.cs

@@ -50,7 +50,7 @@ public override async Task<bool> Sure()
             var succ = false;
             var needPopStash = false;
 
-            var confirmed = await _repo.ConfirmCheckoutBranchAsync().ConfigureAwait(false);
+            var confirmed = await _repo.ConfirmCheckoutBranchAsync();
             if (!confirmed)
             {
                 _repo.SetWatcherEnabled(true);

src/ViewModels/CheckoutCommit.cs

@@ -45,7 +45,7 @@ public override async Task<bool> Sure()
             bool succ;
             var needPop = false;
 
-            var confirmed = await _repo.ConfirmCheckoutBranchAsync().ConfigureAwait(false);
+            var confirmed = await _repo.ConfirmCheckoutBranchAsync();
             if (!confirmed)
             {
                 _repo.SetWatcherEnabled(true);

src/ViewModels/LauncherPage.cs

@@ -105,28 +105,19 @@ public async void ProcessPopup()
                     return;
 
                 dump.InProgress = true;
-                var task = dump.Sure();
-                var finished = false;
-                if (task != null)
+
+                try
                 {
-                    try
-                    {
-                        finished = await task;
-                    }
-                    catch (Exception e)
-                    {
-                        App.LogException(e);
-                    }
-
-                    dump.InProgress = false;
+                    var finished = await dump.Sure();
                     if (finished)
                         Popup = null;
                 }
-                else
+                catch (Exception e)
                 {
-                    dump.InProgress = false;
-                    Popup = null;
+                    App.LogException(e);
                 }
+
+                dump.InProgress = false;
             }
         }