wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-25 06:12:16 +03:00
Code Issues Projects Releases Wiki Activity

fix wezterm connect --workspace

Browse Source 
When creating the initial window, we didn't pass through the
provided workspace name.

refs: #2734
This commit is contained in:
Wez Furlong 2023-04-02 14:04:20 -07:00
parent ec85c243e9
commit 3dc2ac0a75
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.md
View File

@ -78,6 +78,8 @@ As features stabilize some brief notes about them will accumulate here.
* macOS: CTRL-Q had to be pressed twice to register when `use_ime=true`. #2630
* mux: [tab:set_title()](config/lua/MuxTab/set_title.md) didn't get passed to
the remote server, so any tab title changes were lost when reconnecting. #1598
* `wezterm connect --workspace WS DOM` didn't use the provided workspace when
starting up the mux server. #2734
### 20230326-111934-3666303c

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

@ -266,6 +266,7 @@ async fn spawn_tab_in_domain_if_mux_is_empty(
cmd: Option<CommandBuilder>,
is_connecting: bool,
domain: Option<Arc<dyn Domain>>,
workspace: Option<String>,
) -> anyhow::Result<()> {
let mux = Mux::get();
@ -290,7 +291,6 @@ async fn spawn_tab_in_domain_if_mux_is_empty(
// from the size specified in the remote mux.
// We use the TabAddedToWindow mux notification
// to detect and adjust the size later on.
let workspace = None;
let position = None;
let builder = mux.new_empty_window(workspace, position);
*builder
@ -520,7 +520,7 @@ async fn async_run_terminal_gui(
trigger_and_log_gui_attached(MuxDomain(domain.domain_id())).await;
}
}
spawn_tab_in_domain_if_mux_is_empty(cmd, is_connecting, domain).await
spawn_tab_in_domain_if_mux_is_empty(cmd, is_connecting, domain, opts.workspace).await
}
#[derive(Debug)]