From 2891856de7febd9744a5f9a580cce4c4d7c638e9 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 23 May 2019 00:16:54 +0100 Subject: [PATCH] [OSX] HotFix prevent crashing on app launch. --- src/Avalonia.Controls/Application.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs index 0e696e0199..9f9fe5eae1 100644 --- a/src/Avalonia.Controls/Application.cs +++ b/src/Avalonia.Controls/Application.cs @@ -255,16 +255,13 @@ namespace Avalonia if (MainWindow == null) { - Dispatcher.UIThread.Post(() => + if (!mainWindow.IsVisible) { - if (!mainWindow.IsVisible) - { - mainWindow.Show(); - } - - MainWindow = mainWindow; - }); - } + mainWindow.Show(); + } + + MainWindow = mainWindow; + } return Run(new CancellationTokenSource()); }