Fix main window closing when dialog is closed (#1065)

This commit is contained in:
MBucari 2024-12-04 19:11:36 -07:00
parent 9ce6cb54ab
commit d592e9435e

View File

@ -46,11 +46,6 @@ namespace LibationAvalonia
try try
{ {
var config = LibationScaffolding.RunPreConfigMigrations(); var config = LibationScaffolding.RunPreConfigMigrations();
//Start as much work in parallel as possible.
var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
var appBuilderTask = Task.Run(BuildAvaloniaApp);
if (config.LibationSettingsAreValid) if (config.LibationSettingsAreValid)
{ {
// most migrations go in here // most migrations go in here
@ -62,9 +57,7 @@ namespace LibationAvalonia
App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true)); App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
} }
appBuilderTask.GetAwaiter().GetResult().SetupWithLifetime(classicLifetimeTask.GetAwaiter().GetResult()); BuildAvaloniaApp().StartWithClassicDesktopLifetime(null);
classicLifetimeTask.Result.Start(null);
} }
catch (Exception ex) catch (Exception ex)
{ {