Fix closeOnExit: always (#16090)

zadjii-msft · web-flow · commit 4145f1876877 · 2023-10-03T13:41:18.000-07:00
Well, Pane doesn't _only_ care if the connection isn't entering a terminal state. It does need to update its own state first. Regressed in #15335 Closes #16068
diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp
@@ -1040,6 +1040,7 @@ winrt::fire_and_forget Pane::_ControlConnectionStateChangedHandler(const winrt::
         newConnectionState = coreState.ConnectionState();
     }
 
+    const auto previousConnectionState = std::exchange(_connectionState, newConnectionState);
     if (newConnectionState < ConnectionState::Closed)
     {
         // Pane doesn't care if the connection isn't entering a terminal state.
@@ -1066,7 +1067,6 @@ winrt::fire_and_forget Pane::_ControlConnectionStateChangedHandler(const winrt::
         co_return;
     }
 
-    const auto previousConnectionState = std::exchange(_connectionState, newConnectionState);
     if (previousConnectionState < ConnectionState::Connected && newConnectionState >= ConnectionState::Failed)
     {
         // A failure to complete the connection (before it has _connected_) is not covered by "closeOnExit".

Original file line number	Diff line number	Diff line change
`@@ -1040,6 +1040,7 @@ winrt::fire_and_forget Pane::_ControlConnectionStateChangedHandler(const winrt::`
`1040`	`1040`	`newConnectionState = coreState.ConnectionState();`
`1041`	`1041`	`}`
`1042`	`1042`
	`1043`	`+ const auto previousConnectionState = std::exchange(_connectionState, newConnectionState);`
`1043`	`1044`	`if (newConnectionState < ConnectionState::Closed)`
`1044`	`1045`	`{`
`1045`	`1046`	`// Pane doesn't care if the connection isn't entering a terminal state.`
`@@ -1066,7 +1067,6 @@ winrt::fire_and_forget Pane::_ControlConnectionStateChangedHandler(const winrt::`
`1066`	`1067`	`co_return;`
`1067`	`1068`	`}`
`1068`	`1069`
`1069`		`- const auto previousConnectionState = std::exchange(_connectionState, newConnectionState);`
`1070`	`1070`	`if (previousConnectionState < ConnectionState::Connected && newConnectionState >= ConnectionState::Failed)`
`1071`	`1071`	`{`
`1072`	`1072`	`// A failure to complete the connection (before it has _connected_) is not covered by "closeOnExit".`