Fix single-tab window tear-off crash #17251
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lhecker
approved these changes
May 12, 2024
| @@ -1051,7 +1051,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation | |||
| // MSFT 33353327: We're purposefully not using _initializedTerminal to ensure we're fully initialized. | |||
| // Doing so makes us return nullptr when XAML requests an automation peer. | |||
| // Instead, we need to give XAML an automation peer, then fix it later. | |||
| if (!_IsClosing()) | |||
| if (!_IsClosing() && !_detached) | |||
There was a problem hiding this comment.
Does it make sense to instead check for !_interactivity since it's used below?
There was a problem hiding this comment.
When termcontrol isn't detached or closing we expect _interactivity to be non-null, no?
Given #10971 has happened in the past, I think THROW_HR_IF_NULL(E_UNEXPECTED, _interactivity) is better suited.
|
Unlinked #17246 because this doesn't fix all the issues mentioned in that thread. |
DHowett
approved these changes
May 13, 2024
DHowett
pushed a commit
that referenced
this pull request
May 13, 2024
## Validation Steps Performed - Opened multi-tab terminal window with Narrator. Narrator can read characters from the tabs. - Started a drag and drop (tear-off) of a tab, and it didn't crash. This was repeated multiple times. (cherry picked from commit 30ef1f4) Service-Card-Id: 92546868 Service-Version: 1.20
DHowett
pushed a commit
that referenced
this pull request
May 13, 2024
## Validation Steps Performed - Opened multi-tab terminal window with Narrator. Narrator can read characters from the tabs. - Started a drag and drop (tear-off) of a tab, and it didn't crash. This was repeated multiple times. (cherry picked from commit 30ef1f4) Service-Card-Id: 92546869 Service-Version: 1.21
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Validation Steps Performed