Parent window of error dialog is now determined only when necessary

stakira · May 11, 2024 · f18023a · f18023a
1 parent 0356417
commit f18023a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/OpenUtau/Views/MainWindow.axaml.cs b/OpenUtau/Views/MainWindow.axaml.cs
@@ -1329,7 +1329,7 @@ public void OnNext(UCommand cmd, bool isUndo) {
                            MessageBox.MessageBoxButtons.Ok);
                         break;
                     default:
-                        MessageBox.ShowError(this, notif.e, notif.message);
+                        MessageBox.ShowError(this, notif.e, notif.message, true);
                         break;
                 }
             } else if (cmd is LoadingNotification loadingNotif && loadingNotif.window == typeof(MainWindow)) {

diff --git a/OpenUtau/Views/MessageBox.axaml.cs b/OpenUtau/Views/MessageBox.axaml.cs
@@ -30,14 +30,16 @@ public void SetText(string text) {
             });
         }
 
-        public static Task<MessageBoxResult> ShowError(Window parent, Exception? e, string message = "") {
+        public static Task<MessageBoxResult> ShowError(Window parent, Exception? e, string message = "", bool fromNotif = false) {
             string text = message;
             string title = ThemeManager.GetString("errors.caption");
-            IReadOnlyList<Window> dialogs = ((IClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime!).Windows;
-            foreach (var dialog in dialogs) {
-                if (dialog.IsActive) {
-                    parent = dialog;
-                    break;
+            if (fromNotif) {
+                IReadOnlyList<Window> dialogs = ((IClassicDesktopStyleApplicationLifetime)Application.Current!.ApplicationLifetime!).Windows;
+                foreach (var dialog in dialogs) {
+                    if (dialog.IsActive) {
+                        parent = dialog;
+                        break;
+                    }
                 }
             }