[PR #12205] [MERGED] Misc. elevation crash fixes #28898

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

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/12205
Author: @zadjii-msft
Created: 1/20/2022
Status: ✅ Merged
Merged: 1/24/2022
Merged by: @undefined

Base: main ← Head: dev/migrie/b/12169-elevate-jumplist-crash


📝 Commits (10+)

  • dd213a5 not an actual fix for 12169, but a crash nonetheless
  • ba49121 This was my prototyped fix for the crash, but uuhhhhggggggg
  • 4487aa7 Probably should have been in the previous commit
  • 0b18ae4 Don't create the window at all when autoelevating
  • 4275c50 fix a crash on startup where we might not have yet loaded the settings
  • ff72599 auto promote the first split to a tab in this scenario
  • 9ddcdbc dead code
  • ab217a7 spel
  • 581600e Merge remote-tracking branch 'origin/main' into dev/migrie/b/12169-elevate-jumplist-crash
  • 062aff5 comments are good

📊 Changes

8 files changed (+179 additions, -4 deletions)

View changed files

📝 .github/actions/spelling/allow/allow.txt (+1 -0)
📝 src/cascadia/Remoting/WindowManager.cpp (+5 -2)
📝 src/cascadia/TerminalApp/AppLogic.cpp (+18 -0)
📝 src/cascadia/TerminalApp/AppLogic.h (+2 -0)
📝 src/cascadia/TerminalApp/AppLogic.idl (+2 -0)
📝 src/cascadia/TerminalApp/TerminalPage.cpp (+132 -1)
📝 src/cascadia/TerminalApp/TerminalPage.h (+2 -0)
📝 src/cascadia/WindowsTerminal/AppHost.cpp (+17 -1)

📄 Description

This is a collection of fixes:

  • dd213a5c18: This was a crash I discovered while investigating. Probably not the root cause crash, but a crash nonetheless.
  • ba491212afcbafdabc89d88b78f1dc5076dea0c3...0b18ae4ed73cbb15452c7c15aefa0c2671db9605: A collection of fixes to not create the window when we're about to handoff each of the new tabs, panes, to an elevated window. That should prevent us from starting up XAML at all, which should take care of #12169. Additionally, it'll prevent us from restoring the unelevated windows, which should resolve #12190
  • The remainder of the commits where fixes for other weird edge cases as a part of this. Notably:
    • ff72599189: Autopromote the first split-pane to a new tab, in the case that it's preceded with only new-tab actions that opened elevated windows.

checklist


🔄 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/12205 **Author:** [@zadjii-msft](https://github.com/zadjii-msft) **Created:** 1/20/2022 **Status:** ✅ Merged **Merged:** 1/24/2022 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `dev/migrie/b/12169-elevate-jumplist-crash` --- ### 📝 Commits (10+) - [`dd213a5`](https://github.com/microsoft/terminal/commit/dd213a5c180997e8b761ca9f8078c0ba58503a0b) not an actual fix for 12169, but a crash nonetheless - [`ba49121`](https://github.com/microsoft/terminal/commit/ba491212afcbafdabc89d88b78f1dc5076dea0c3) This was my prototyped fix for the crash, but uuhhhhggggggg - [`4487aa7`](https://github.com/microsoft/terminal/commit/4487aa7aedb67a53aeb3aa6b76d9e5b718c42ef5) Probably should have been in the previous commit - [`0b18ae4`](https://github.com/microsoft/terminal/commit/0b18ae4ed73cbb15452c7c15aefa0c2671db9605) Don't create the window at all when autoelevating - [`4275c50`](https://github.com/microsoft/terminal/commit/4275c50d426572d73d6db27848b55921e2611aa2) fix a crash on startup where we might not have yet loaded the settings - [`ff72599`](https://github.com/microsoft/terminal/commit/ff7259918933067872a14df5b0e3c6f6d7764e57) auto promote the first split to a tab in this scenario - [`9ddcdbc`](https://github.com/microsoft/terminal/commit/9ddcdbca8f8814d3787c1d6fca7f61f8ee92d755) dead code - [`ab217a7`](https://github.com/microsoft/terminal/commit/ab217a7c5723e393c5071fc2e1f09374eadb494a) spel - [`581600e`](https://github.com/microsoft/terminal/commit/581600e335ebbe4836b2338b4076f18e229638b7) Merge remote-tracking branch 'origin/main' into dev/migrie/b/12169-elevate-jumplist-crash - [`062aff5`](https://github.com/microsoft/terminal/commit/062aff5b0cc7f88bc75dde56b7a4ed23d13f50ff) comments are good ### 📊 Changes **8 files changed** (+179 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `.github/actions/spelling/allow/allow.txt` (+1 -0) 📝 `src/cascadia/Remoting/WindowManager.cpp` (+5 -2) 📝 `src/cascadia/TerminalApp/AppLogic.cpp` (+18 -0) 📝 `src/cascadia/TerminalApp/AppLogic.h` (+2 -0) 📝 `src/cascadia/TerminalApp/AppLogic.idl` (+2 -0) 📝 `src/cascadia/TerminalApp/TerminalPage.cpp` (+132 -1) 📝 `src/cascadia/TerminalApp/TerminalPage.h` (+2 -0) 📝 `src/cascadia/WindowsTerminal/AppHost.cpp` (+17 -1) </details> ### 📄 Description This is a collection of fixes: * dd213a5c180997e8b761ca9f8078c0ba58503a0b: This was a crash I discovered while investigating. Probably not the root cause crash, but a crash nonetheless. * ba491212afcbafdabc89d88b78f1dc5076dea0c3...0b18ae4ed73cbb15452c7c15aefa0c2671db9605: A collection of fixes to _not_ create the window when we're about to handoff each of the new tabs, panes, to an elevated window. That should prevent us from starting up XAML at all, which should take care of #12169. Additionally, it'll prevent us from restoring the unelevated windows, which should resolve #12190 * The remainder of the commits where fixes for other weird edge cases as a part of this. Notably: * ff7259918933067872a14df5b0e3c6f6d7764e57: Autopromote the first `split-pane` to a new tab, in the case that it's preceded with only `new-tab` actions that opened elevated windows. #### checklist * [x] I work here * [x] Docs are fine * [x] Closes #12190 * [x] Closes #12169 --- <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:31:30 +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#28898