microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-12 18:41:01 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Fix crash in AppHost::_QuitRequested (#17848)

Browse Source
This commit is contained in:
Leonard Hecker 2024-09-06 17:19:03 +02:00 committed by GitHub
parent 4eb06fee07
commit 00f46e400a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1221,11 +1221,23 @@ void AppHost::_IsQuakeWindowChanged(const winrt::Windows::Foundation::IInspectab
// Raised from our Peasant. We handle by propagating the call to our terminal window. // Raised from our Peasant. We handle by propagating the call to our terminal window.
void AppHost::_QuitRequested(const winrt::Windows::Foundation::IInspectable&, const winrt::Windows::Foundation::IInspectable&) void AppHost::_QuitRequested(const winrt::Windows::Foundation::IInspectable&, const winrt::Windows::Foundation::IInspectable&)
{ {
const auto root = _windowLogic.GetRoot();
if (!root)
{
return;
}
const auto dispatcher = root.Dispatcher();
if (!dispatcher)
{
return;
}
// We process the shutdown synchronously here, because otherwise the // We process the shutdown synchronously here, because otherwise the
// AutomaticShutdownRequested() logic wouldn't run synchronously either. // AutomaticShutdownRequested() logic wouldn't run synchronously either.
til::latch latch{ 1 }; til::latch latch{ 1 };
_windowLogic.GetRoot().Dispatcher().RunAsync(winrt::Windows::UI::Core::CoreDispatcherPriority::Normal, [&latch, weakThis = weak_from_this()]() { dispatcher.RunAsync(winrt::Windows::UI::Core::CoreDispatcherPriority::Normal, [&latch, weakThis = weak_from_this()]() {
const auto countDownOnExit = wil::scope_exit([&latch] { const auto countDownOnExit = wil::scope_exit([&latch] {
latch.count_down(); latch.count_down();
}); });