From efd6156fa818b79f2d88c29edb808313cea0e46c Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Thu, 14 Jul 2022 18:25:28 -0600 Subject: [PATCH] Fix STAThread error --- Source/LibationWinForms/AvaloniaUI/MessageBox.cs | 1 + Source/LibationWinForms/Program.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/LibationWinForms/AvaloniaUI/MessageBox.cs b/Source/LibationWinForms/AvaloniaUI/MessageBox.cs index 235c8a3f..be05e69c 100644 --- a/Source/LibationWinForms/AvaloniaUI/MessageBox.cs +++ b/Source/LibationWinForms/AvaloniaUI/MessageBox.cs @@ -219,6 +219,7 @@ namespace LibationWinForms.AvaloniaUI var vm = new MessageBoxViewModel(message, caption, buttons, icon, defaultButton); dialog.DataContext = vm; dialog.CanResize = false; + dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner; var tbx = dialog.FindControl("messageTextBlock"); tbx.MinWidth = vm.TextBlockMinWidth; diff --git a/Source/LibationWinForms/Program.cs b/Source/LibationWinForms/Program.cs index 627c1f63..8a5b6f62 100644 --- a/Source/LibationWinForms/Program.cs +++ b/Source/LibationWinForms/Program.cs @@ -19,7 +19,7 @@ namespace LibationWinForms static extern bool AllocConsole(); [STAThread] - static async Task Main() + static void Main() { var config = LoadLibationConfig(); @@ -61,22 +61,22 @@ namespace LibationWinForms if (true) //(config.GetNonString("BetaOptIn")) { //Start as much work in parallel as possible. - var runPreStartTasksTask = Task.Run(() => RunDbMigrations(config)); + var runDbMigrationsTask = Task.Run(() => RunDbMigrations(config)); var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime()); var appBuilderTask = Task.Run(BuildAvaloniaApp); - if (!await runPreStartTasksTask) + if (!runDbMigrationsTask.GetAwaiter().GetResult()) return; var runOtherMigrationsTask = Task.Run(() => RunOtherMigrations(config)); var dbLibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true)); - (await appBuilderTask).SetupWithLifetime(await classicLifetimeTask); + appBuilderTask.GetAwaiter().GetResult().SetupWithLifetime(classicLifetimeTask.GetAwaiter().GetResult()); - if (!await runOtherMigrationsTask) + if (!runOtherMigrationsTask.GetAwaiter().GetResult()) return; - ((AvaloniaUI.Views.MainWindow)classicLifetimeTask.Result.MainWindow).OnLibraryLoaded(await dbLibraryTask); + ((AvaloniaUI.Views.MainWindow)classicLifetimeTask.Result.MainWindow).OnLibraryLoaded(dbLibraryTask.GetAwaiter().GetResult()); classicLifetimeTask.Result.Start(null); }