From 86f8341f3bb3134af333ae7c551b13422f23bcb8 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@purplebricks.com>
Date: Wed, 14 May 2025 10:44:48 +0100
Subject: [PATCH] Fix ShowWindow to use owner in non-modal, if available

---
 src/App.axaml.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 6e45164d..ec0f79c9 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -109,8 +109,13 @@ namespace SourceGit
         {
             if (data is Views.ChromelessWindow window)
             {
-                if (showAsDialog && Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
-                    window.ShowDialog(owner);
+                if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
+                {
+                    if (showAsDialog)
+                        window.ShowDialog(owner);
+                    else
+                        window.Show(owner);
+                }
                 else
                     window.Show();