wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-23 15:04:36 +03:00
Code Issues Projects Releases Wiki Activity

fix wezterm connect sshdomain when password auth is needed

Browse Source 
We need the mux window builder to notify in order for the ConnectionUI
to show up, but we wouldn't trigger the notify (which happens on drop)
until we'd awaited the connection ui completing password auth.

Force it to drop earlier to unblock.

refs: https://github.com/wez/wezterm/issues/2194
This commit is contained in:
Wez Furlong 2022-06-27 16:47:00 -07:00
parent 7adb5ace1c
commit fb1a659c4c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.md
View File

@ -14,6 +14,7 @@ As features stabilize some brief notes about them will accumulate here.
#### Fixed
* [ActivateKeyTable](config/lua/keyassignment/ActivateKeyTable.md)'s `replace_current` field was not actually optional. Made it optional. [#2179](https://github.com/wez/wezterm/issues/2179)
* `winget` causes toast notification spam [#2185](https://github.com/wez/wezterm/issues/2185)
* `wezterm connect sshdomain` could hang on startup if password authentication was required [#2194](https://github.com/wez/wezterm/issues/2194)
### 20220624-141144-bd1b7c5d

11
wezterm-gui/src/main.rs
View File

@ -295,9 +295,14 @@ async fn spawn_tab_in_default_domain_if_mux_is_empty(
}
}
let window_id = mux.new_empty_window(None);
let window_id = {
// Force the builder to notify the frontend early,
// so that the attach await below doesn't block it
let builder = mux.new_empty_window(None);
*builder
};
domain.attach(Some(*window_id)).await?;
domain.attach(Some(window_id)).await?;
let have_panes_in_domain = mux
.iter_panes()
@ -322,7 +327,7 @@ async fn spawn_tab_in_default_domain_if_mux_is_empty(
let dpi = config.dpi.unwrap_or_else(|| ::window::default_dpi()) as u32;
let _tab = domain
.spawn(config.initial_size(dpi), cmd, None, *window_id)
.spawn(config.initial_size(dpi), cmd, None, window_id)
.await?;
Ok(())
}