Skip to content

Commit b77ea32

Browse files
committed
ui: workaround AvaloniaUI/Avalonia #10296
1 parent 37f6100 commit b77ea32

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/shared/Core/UI/AvaloniaUi.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Threading.Tasks;
44
using Avalonia;
55
using Avalonia.Controls;
6+
using Avalonia.Controls.ApplicationLifetimes;
67
using Avalonia.Threading;
78
using GitCredentialManager.Interop.Windows.Native;
89
using GitCredentialManager.UI.Controls;
@@ -48,7 +49,14 @@ public static Task ShowWindowAsync(Func<Window> windowFunc, object dataContext,
4849
AppBuilder.Configure<AvaloniaApp>()
4950
.UsePlatformDetect()
5051
.LogToTrace()
51-
.SetupWithoutStarting();
52+
// Workaround https://github.com/AvaloniaUI/Avalonia/issues/10296
53+
// by always setting a application lifetime.
54+
.SetupWithLifetime(
55+
new ClassicDesktopStyleApplicationLifetime
56+
{
57+
ShutdownMode = ShutdownMode.OnExplicitShutdown
58+
}
59+
);
5260

5361
appInitialized.Set();
5462

0 commit comments

Comments
 (0)