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

Fix a rampant crash in TSFInputControl when opening new tabs #4830

Merged
7 commits merged into from
Mar 7, 2020
Merged

Fix a rampant crash in TSFInputControl when opening new tabs #4830

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01404a5
This fixes the TSFInputControl crash that's plaguing the team like it…
zadjii-msft Mar 6, 2020
64e3427
Try to do a get_weak event, but that's not how this works
zadjii-msft Mar 6, 2020
1c8c32d
ctor the `_terminal` _immediately_
zadjii-msft Mar 6, 2020
db09511
Revert "Try to do a get_weak event, but that's not how this works"
zadjii-msft Mar 6, 2020
cc434f5
holy shit this will bluescreen your PC
zadjii-msft Mar 6, 2020
9faa81a
Revert "holy shit this will bluescreen your PC"
zadjii-msft Mar 6, 2020
265a97c
Revert "ctor the `_terminal` _immediately_"
zadjii-msft Mar 6, 2020
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
24 changes: 17 additions & 7 deletions src/cascadia/TerminalControl/TermControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
// If 'weakThis' is locked, then we can safely work with 'this'
if (auto control{ weakThis.get() })
{
auto lock = _terminal->LockForWriting();
auto nativePanel = SwapChainPanel().as<ISwapChainPanelNative>();
nativePanel->SetSwapChain(chain.Get());
if (_terminal)
{
auto lock = _terminal->LockForWriting();
auto nativePanel = SwapChainPanel().as<ISwapChainPanelNative>();
nativePanel->SetSwapChain(chain.Get());
}
}
}

Expand All @@ -479,10 +482,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation

if (auto control{ weakThis.get() })
{
_terminal->LockConsole();
auto nativePanel = SwapChainPanel().as<ISwapChainPanelNative>();
nativePanel->SetSwapChain(chain.Get());
_terminal->UnlockConsole();
if (_terminal)
{
auto lock = _terminal->LockForWriting();
auto nativePanel = SwapChainPanel().as<ISwapChainPanelNative>();
nativePanel->SetSwapChain(chain.Get());
}
}
}

Expand Down Expand Up @@ -2070,6 +2075,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
// - <none>
void TermControl::_CurrentCursorPositionHandler(const IInspectable& /*sender*/, const CursorPositionEventArgs& eventArgs)
{
// If we haven't initialized yet, just quick return.
if (!_terminal)
{
return;
}
const COORD cursorPos = _terminal->GetCursorPosition();
Windows::Foundation::Point p = { gsl::narrow_cast<float>(cursorPos.X), gsl::narrow_cast<float>(cursorPos.Y) };
eventArgs.CurrentPosition(p);
Expand Down