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

Register the GetWindowLayoutRequested handler only when ready (#15161)

Browse Source 
Moves our `GetWindowLayoutRequested` handler AFTER the xaml island is
started. The `AppHost::_GetWindowLayoutAsync` handler requires us to be
able to work on our UI thread, which requires that we have a
`Dispatcher` ready for us to move to. If we set up this callback in the
ctor, then it is possible for there to be a time slice where
* the monarch creates the peasant for us,
* we get ctor'ed (registering the callback)
* then the monarch attempts to query all _peasants_ for their layout,
coming back to ask us even before XAML has been created.

I believe this was the source of the crash that was reported in a mail
thread. It actually happened to me once while debugging another branch.
Alas, this was realy hard to hit in the first place, so I'm not
_totally_ certain this fixes it.

Related to #14957
This commit is contained in:
Mike Griese
2023-04-12 11:57:25 -05:00
committed by GitHub
parent 10bdadffbd
commit f671f065bf
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cascadia/WindowsTerminal/AppHost.cpp
View File

@@ -87,13 +87,6 @@ AppHost::AppHost(const winrt::TerminalApp::AppLogic& logic,
_window->SetAutoHideWindow(_windowLogic.AutoHideWindow());
_window->MakeWindow();
_GetWindowLayoutRequestedToken = _peasant.GetWindowLayoutRequested([this](auto&&,
const Remoting::GetWindowLayoutArgs& args) {
// The peasants are running on separate threads, so they'll need to
// swap what context they are in to the ui thread to get the actual layout.
args.WindowLayoutJsonAsync(_GetWindowLayoutAsync());
});
}
AppHost::~AppHost()
@@ -388,6 +381,23 @@ void AppHost::Initialize()
_revokers.RequestMoveContent = _windowLogic.RequestMoveContent(winrt::auto_revoke, { this, &AppHost::_handleMoveContent });
_revokers.RequestReceiveContent = _windowLogic.RequestReceiveContent(winrt::auto_revoke, { this, &AppHost::_handleReceiveContent });
_revokers.SendContentRequested = _peasant.SendContentRequested(winrt::auto_revoke, { this, &AppHost::_handleSendContent });
// Add our GetWindowLayoutRequested handler AFTER the xaml island is
// started. Our _GetWindowLayoutAsync handler requires us to be able to work
// on our UI thread, which requires that we have a Dispatcher ready for us
// to move to. If we set up this callback in the ctor, then it is possible
// for there to be a time slice where
// * the monarch creates the peasant for us,
// * we get constructed (registering the callback)
// * then the monarch attempts to query all _peasants_ for their layout,
// coming back to ask us even before XAML has been created.
_GetWindowLayoutRequestedToken = _peasant.GetWindowLayoutRequested([this](auto&&,
const Remoting::GetWindowLayoutArgs& args) {
// The peasants are running on separate threads, so they'll need to
// swap what context they are in to the ui thread to get the actual layout.
args.WindowLayoutJsonAsync(_GetWindowLayoutAsync());
});
// BODGY
// On certain builds of Windows, when Terminal is set as the default
// it will accumulate an unbounded amount of queued animations while