[PR #1651] [MERGED] Fix a bug where Terminal may crash or hang at shutdown #24628

Open
opened 2026-01-31 09:04:28 +00:00 by claunia · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/1651
Author: @ocalvo
Created: 6/26/2019
Status: ✅ Merged
Merged: 6/26/2019
Merged by: @miniksa

Base: master ← Head: master


📝 Commits (9)

📊 Changes

6 files changed (+18 additions, -6 deletions)

View changed files

📝 src/cascadia/TerminalApp/App.cpp (+2 -4)
📝 src/cascadia/TerminalApp/App.idl (+2 -0)
📝 src/cascadia/TerminalApp/pch.h (+1 -0)
📝 src/cascadia/WindowsTerminal/AppHost.cpp (+3 -1)
📝 src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj (+10 -0)
📝 src/cascadia/WindowsTerminal/pch.h (+0 -1)

📄 Description

Summary of the Pull Request

Fix issue 1380

References

1380

PR Checklist

  • Closes Bug Report: Cursor doesn't blink when opening new tab (#1380)
  • CLA signed. If not, go over here and sign the CLA
  • Tests added/passed
  • Requires documentation to be updated
  • I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

The order of destruction is incorrect:
Construction: 1. XamlApp, 2. XamlIsland
Destruction: 1. XamlApp, 2. XamlIsland, it should be 1. Xamlsland, 2. XamlApp

Validation Steps Performed

Manually debugged that the Xaml core is de-initialized correctly.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/1651 **Author:** [@ocalvo](https://github.com/ocalvo) **Created:** 6/26/2019 **Status:** ✅ Merged **Merged:** 6/26/2019 **Merged by:** [@miniksa](https://github.com/miniksa) **Base:** `master` ← **Head:** `master` --- ### 📝 Commits (9) - [`f847137`](https://github.com/microsoft/terminal/commit/f847137b6474e4aa5859ff916715bfa255caf549) Fix crash at shutdown - [`fa9d779`](https://github.com/microsoft/terminal/commit/fa9d77930cb6e94159f6eec340809ea7db0438c8) Fix build break (but not sure why or how) - [`0746a93`](https://github.com/microsoft/terminal/commit/0746a934001ed27fe557e44f44195edd5cae09c4) Fix build break in ARM64 - [`89e4285`](https://github.com/microsoft/terminal/commit/89e4285b8d0857a1b295f6eba02106d7b3bf8392) Fix a bug where Terminal may crash at shutdown - [`4379119`](https://github.com/microsoft/terminal/commit/43791194ff5f7db9d5c57ecd8defc27d7466bdaf) Fix a bug where Terminal may crash at shutdown - [`b60c414`](https://github.com/microsoft/terminal/commit/b60c4142e0d94552c346d61326912e1523187a1a) Fix build break - [`af59c4b`](https://github.com/microsoft/terminal/commit/af59c4b9bfb4d4291b6df3063d6be3f65e8a392f) Update src/cascadia/WindowsTerminal/AppHost.cpp - [`5d6382f`](https://github.com/microsoft/terminal/commit/5d6382f9aaab2dc56e2b53754ba732acb53f5e39) Fix bad merge - [`8e1956d`](https://github.com/microsoft/terminal/commit/8e1956de90f137e62d6e89f9d72a4f3061cee468) Merge branch 'master' of https://github.com/microsoft/terminal ### 📊 Changes **6 files changed** (+18 additions, -6 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalApp/App.cpp` (+2 -4) 📝 `src/cascadia/TerminalApp/App.idl` (+2 -0) 📝 `src/cascadia/TerminalApp/pch.h` (+1 -0) 📝 `src/cascadia/WindowsTerminal/AppHost.cpp` (+3 -1) 📝 `src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj` (+10 -0) 📝 `src/cascadia/WindowsTerminal/pch.h` (+0 -1) </details> ### 📄 Description <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Fix issue [1380](https://github.com/microsoft/terminal/issues/1380) <!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> ## References [1380](https://github.com/microsoft/terminal/issues/1380) <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [X] Closes #1380 * [X] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Requires documentation to be updated * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments The order of destruction is incorrect: Construction: 1. XamlApp, 2. XamlIsland Destruction: 1. XamlApp, 2. XamlIsland, it should be 1. Xamlsland, 2. XamlApp <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Manually debugged that the Xaml core is de-initialized correctly. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:04:28 +00:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#24628