Skip to content

fix(macOS): prevent crash on quit caused by double shutdown path #2129

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

Open
msavara wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −1
Open

fix(macOS): prevent crash on quit caused by double shutdown path #2129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion src/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,18 @@ public static void Quit(int exitCode)
{
if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
desktop.MainWindow?.Close();
// IMPORTANT (especially on macOS):
// App shutdown must go through a single path only.
//
// The launcher runs with `ShutdownMode.OnMainWindowClose`, so calling
// `MainWindow.Close()` already starts the application shutdown sequence.
// If we then also call `desktop.Shutdown(...)`, we re-enter teardown
// from a second path while native resources (AppKit/Avalonia dispatcher)
// are already being finalized.
//
// In practice this has caused terminate/exit-time crashes on macOS
// (SIGABRT around NSApplication terminate + dispatcher cleanup).
// Therefore, `Quit()` must call only `desktop.Shutdown(exitCode)`.
desktop.Shutdown(exitCode);
}
else
Expand Down