Skip to content

Commit

Permalink
This is a simple part of the fix, but not everything
Browse files Browse the repository at this point in the history
  We're still hanging, then just dying "gracefully" on startup. More investigation needed.
  • Loading branch information
zadjii-msft committed Jan 27, 2022
1 parent 1e47d7a commit 8c63612
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/cascadia/TerminalApp/TerminalPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,10 @@ namespace winrt::TerminalApp::implementation
// - true if we're not elevated but all relevant pane-spawning actions are elevated
bool TerminalPage::ShouldImmediatelyHandoffToElevated(const CascadiaSettings& settings) const
{
if (!_startupActions || IsElevated())
// GH#12267: Don't forget about defterm handoff here. If we're being
// created for embedding, then _yea_, we don't need to handoff to an
// elevated window.
if (!_startupActions || IsElevated() || _shouldStartInboundListener)
{
// there arent startup actions, or we're elevated. In that case, go for it.
return false;
Expand Down

0 comments on commit 8c63612

Please sign in to comment.