Skip to content
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

Jump to bottom

Fix crash when closing panes very quickly #17450

Merged
merged 3 commits into from
Jun 20, 2024
Merged

Fix crash when closing panes very quickly #17450

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feebb91
almost
PankajBhojwani Jun 19, 2024
291e650
fix
PankajBhojwani Jun 20, 2024
e0526a8
actual fix
PankajBhojwani Jun 20, 2024
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: 7 additions & 6 deletions src/cascadia/TerminalApp/Pane.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,9 @@ void Pane::_SetupChildCloseHandlers()
IPaneContent Pane::_takePaneContent()
{
_closeRequestedRevoker.revoke();
return std::move(_content);
// we cannot return std::move(_content) because we don't want _content to be null,
// since _content gets accessed even after Close is called
return _content;
}

// This method safely sets the content of the Pane. It'll ensure to revoke and
Expand All @@ -1721,15 +1723,14 @@ void Pane::_setPaneContent(IPaneContent content)
{
// The IPaneContent::Close() implementation may be buggy and raise the CloseRequested event again.
// _takePaneContent() avoids this as it revokes the event handler.
if (const auto c = _takePaneContent())
if (_takePaneContent())
{
c.Close();
_content.Close();
}

_content = std::move(content);

if (_content)
if (content)
{
_content = std::move(content);
_closeRequestedRevoker = _content.CloseRequested(winrt::auto_revoke, [this](auto&&, auto&&) { Close(); });
}
}
Expand Down
Loading