Fix defterm in wake of auto-elevation

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -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;
@@ -664,7 +667,11 @@ namespace winrt::TerminalApp::implementation
         // However, we need to make sure to close this window in that scenario.
         // Since there aren't any _tabs_ in this window, we won't ever get a
         // closed event. So do it manually.
-        if (_tabs.Size() == 0)
+        //
+        // GH#12267: Make sure that we don't instantly close ourselves when
+        // we're readying to accept a defterm connection. In that case, we don't
+        // have a tab yet, but will once we're initialized.
+        if (_tabs.Size() == 0 && !(_shouldStartInboundListener || _isEmbeddingInboundListener))
         {
             _LastTabClosedHandlers(*this, nullptr);
         }

src/cascadia/WindowsTerminal/AppHost.cpp

@@ -1443,24 +1443,26 @@ void AppHost::_WindowMoved()
         _logic.DismissDialog();
 
         const auto root{ _logic.GetRoot() };
-
-        try
+        if (root && root.XamlRoot())
         {
-            // This is basically DismissAllPopups which is also in
-            // TerminalSettingsEditor/Utils.h
-            // There isn't a good place that's shared between these two files, but
-            // it's only 5 LOC so whatever.
-            const auto popups{ Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(root.XamlRoot()) };
-            for (const auto& p : popups)
+            try
             {
-                p.IsOpen(false);
+                // This is basically DismissAllPopups which is also in
+                // TerminalSettingsEditor/Utils.h
+                // There isn't a good place that's shared between these two files, but
+                // it's only 5 LOC so whatever.
+                const auto popups{ Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(root.XamlRoot()) };
+                for (const auto& p : popups)
+                {
+                    p.IsOpen(false);
+                }
+            }
+            catch (...)
+            {
+                // We purposely don't log here, because this is exceptionally noisy,
+                // especially on startup, when we're moving the window into place
+                // but might not have a real xamlRoot yet.
             }
-        }
-        catch (...)
-        {
-            // We purposely don't log here, because this is exceptionally noisy,
-            // especially on startup, when we're moving the window into place
-            // but might not have a real xamlRoot yet.
         }
     }
 }