Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(A better) Refactoring of how connection restarting is handled #15240

Merged
merged 15 commits into from
Apr 28, 2023
Merged

(A better) Refactoring of how connection restarting is handled #15240

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
977b9d0
Let controls swap their connection, rudimentary work for duplicating …
zadjii-msft Apr 21, 2023
f5be21d
this is a very sensible Pane refactoring
zadjii-msft Apr 25, 2023
ac50f3d
I think it all worked on the first try?
zadjii-msft Apr 25, 2023
8fd2c60
Merge remote-tracking branch 'origin/main' into dev/migrie/f/more-san…
zadjii-msft Apr 25, 2023
35306ee
from initial commentary with dustin
zadjii-msft Apr 25, 2023
cf86693
Merge remote-tracking branch 'origin/main' into dev/migrie/f/more-san…
zadjii-msft Apr 26, 2023
7f53dbb
Enable restarting defterm connections
zadjii-msft Apr 26, 2023
733b742
Merge remote-tracking branch 'origin/main' into dev/migrie/f/more-san…
zadjii-msft Apr 26, 2023
22ccd6b
yea I'm cool with this
zadjii-msft Apr 27, 2023
ad1f333
that's kinda obvious
zadjii-msft Apr 27, 2023
04ade0b
move this event so that it's after we change the connection
zadjii-msft Apr 27, 2023
7888277
bail
zadjii-msft Apr 27, 2023
8877336
okay dustin you're right this is better
zadjii-msft Apr 28, 2023
d951cf7
Merge remote-tracking branch 'origin/main' into dev/migrie/f/more-san…
zadjii-msft Apr 28, 2023
c4dabe7
yes, that was dirty, you're right
zadjii-msft Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/cascadia/TerminalControl/ControlCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,20 +262,20 @@ namespace winrt::Microsoft::Terminal::Control::implementation
if (_connection)
{
_connectionOutputEventRevoker.revoke();

// Fire off a connection state changed notification, to let our hosting
// app know that we're in a different state now.
if (newConnection.State() != _connection.State())
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
{
_ConnectionStateChangedHandlers(*this, nullptr);
DHowett marked this conversation as resolved.
Show resolved Hide resolved
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
}
}

// Subscribe to the connection's disconnected event and call our connection closed handlers.
_connectionStateChangedRevoker = newConnection.StateChanged(winrt::auto_revoke, [this](auto&& /*s*/, auto&& /*v*/) {
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved
_ConnectionStateChangedHandlers(*this, nullptr);
});

// Fire off a connection state changed notification, to let our hosting
// app know that we're in a different state now.
if (newConnection.State() != _connection.State())
{
_ConnectionStateChangedHandlers(*this, nullptr);
}

// Get our current size in rows/cols, and hook them up to
// this connection too.
{
Expand Down