Skip to content

Guard IslandWindow shutdown against exploding? #19322

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Guard IslandWindow shutdown against exploding? #19322

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
10 changes: 9 additions & 1 deletion src/cascadia/WindowsTerminal/IslandWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,15 @@ void IslandWindow::Close()
// WinUI will strongly hold onto the first DesktopWindowXamlSource that is created.
// If we don't manually set the Content() to null first, closing that first window
// will leak all of its contents permanently.
_source.Content(nullptr);
//
// However, sometimes resetting the content during showdown throws an exception.
// We want to continue shutting down, even if this failed (and just leak the
// content if that's what it is going to do.)
try
{
_source.Content(nullptr);
}
CATCH_LOG();

_source.Close();
_source = nullptr;
Expand Down
Loading