Skip to content

Fixed crash that would occur when checking for updates #10365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2022
Merged

Fixed crash that would occur when checking for updates #10365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aa4146
Update service must run on UI thread
gave92 Oct 31, 2022
88804c0
Make sure the window is hidden
gave92 Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions src/Files.App/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,6 @@ private static void EnsureSettingsAndConfigurationAreBootstrapped()
FileTagsManager ??= new FileTagsManager();
SidebarPinnedController ??= new SidebarPinnedController();
TerminalController ??= new TerminalController();

//FileTagsHelpers.UpdateTagsDb();
FileOperationsHelpers.WaitForCompletion();
}

private static async Task StartAppCenter()
Expand Down Expand Up @@ -209,6 +206,7 @@ await Task.WhenAll(
JumpList.InitializeAsync(),
ContextFlyoutItemHelper.CachedNewContextMenuEntries
);
FileTagsHelper.UpdateTagsDb();
});

// Check for required updates
Expand Down Expand Up @@ -243,17 +241,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
EnsureWindowIsInitialized();

EnsureSettingsAndConfigurationAreBootstrapped();
Task.Run(async () =>
{
try
{
await InitializeAppComponentsAsync();
}
catch (Exception ex)
{
Logger.Warn(ex, "Error during InitializeAppComponentsAsync()");
}
});

_ = InitializeAppComponentsAsync().ContinueWith(t => Logger.Warn(t.Exception, "Error during InitializeAppComponentsAsync()"), TaskContinuationOptions.OnlyOnFaulted);

_ = Window.InitializeApplication(activatedEventArgs);
}
Expand Down Expand Up @@ -294,6 +283,8 @@ private async void Window_Closed(object sender, WindowEventArgs args)
{
// Save application state and stop any background activity

await Task.Yield(); // Method can take a long time, make sure the window is hidden

SaveSessionTabs();

if (OutputPath is not null)
Expand Down Expand Up @@ -324,6 +315,9 @@ await SafetyExtensions.IgnoreExceptions(async () =>
Clipboard.Flush();
}
}, Logger);

// Wait for ongoing file operations
FileOperationsHelpers.WaitForCompletion();
}

public static void SaveSessionTabs() // Enumerates through all tabs and gets the Path property and saves it to AppSettings.LastSessionPages
Expand Down