starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-06 13:44:55 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Revoke old event handlers correctly on pane close (#1279)

Browse Source 
(cherry picked from commit 14d2484acf)
This commit is contained in:
Peter Nelson
2019-06-29 02:17:31 +01:00
committed by Dustin Howett
parent 03d730fa70
commit 4559bdd08b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cascadia/TerminalApp/Pane.cpp
View File

@@ -331,7 +331,7 @@ void Pane::_CloseChild(const bool closeFirst)
const auto oldFirstToken = _firstClosedToken;
const auto oldSecondToken = _secondClosedToken;
const auto oldFirst = _firstChild;
const auto oldSecond = _secondClosedToken;
const auto oldSecond = _secondChild;
// Steal all the state from our child
_splitState = remainingChild->_splitState;
@@ -342,9 +342,14 @@ void Pane::_CloseChild(const bool closeFirst)
// Set up new close handlers on the children
_SetupChildCloseHandlers();
// Revoke the old event handlers.
_firstChild->Closed(_firstClosedToken);
_secondChild->Closed(_secondClosedToken);
// Revoke the old event handlers on our new children
_firstChild->Closed(remainingChild->_firstClosedToken);
_secondChild->Closed(remainingChild->_secondClosedToken);
// Revoke event handlers on old panes and controls
oldFirst->Closed(oldFirstToken);
oldSecond->Closed(oldSecondToken);
closedChild->_control.ConnectionClosed(closedChild->_connectionClosedToken);
// Reset our UI:
_root.Children().Clear();