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 panic with window:set_workspace when default domain is mux

Browse Source 
refs: https://github.com/wez/wezterm/issues/2638
This commit is contained in:
Wez Furlong 2022-10-17 07:06:43 -07:00
parent 84de038d5d
commit ac1413a99a
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.md
View File

@ -97,6 +97,9 @@ As features stabilize some brief notes about them will accumulate here.
* Default `CTRL-SHIFT-<NUM>` assignments didn't work on Windows and X11
systems when `key_map_preference = "Mapped"`
[#2623](https://github.com/wez/wezterm/issues/2623)
* Panic when calling `window:set_workspace` when the default domain is a
multiplexer domain.
[#2638](https://github.com/wez/wezterm/issues/2638)
#### Changed

50
wezterm-client/src/domain.rs
View File

@ -271,30 +271,44 @@ fn mux_notify_client_domain(local_domain_id: DomainId, notif: MuxNotification) -
Some(domain) => domain,
None => return false,
};
let domain = match domain.downcast_ref::<ClientDomain>() {
Some(domain) => domain,
None => return false,
};
if domain.downcast_ref::<ClientDomain>().is_none() {
return false;
}
match notif {
MuxNotification::ActiveWorkspaceChanged(_client_id) => {
// TODO: advice remote host of interesting workspaces
}
MuxNotification::WindowWorkspaceChanged(window_id) => {
if let Some(remote_window_id) = domain.local_to_remote_window_id(window_id) {
if let Some(workspace) = mux
.get_window(window_id)
.map(|w| w.get_workspace().to_string())
{
let request = codec::SetWindowWorkspace {
window_id: remote_window_id,
workspace,
};
promise::spawn::spawn_into_main_thread(async move {
let _ = update_remote_workspace(local_domain_id, request).await;
})
.detach();
// Mux::get_window() may trigger a borrow error if called
// immediately; defer the bulk of this work.
// <https://github.com/wez/wezterm/issues/2638>
promise::spawn::spawn_into_main_thread(async move {
let mux = Mux::get().expect("called by mux");
let domain = match mux.get_domain(local_domain_id) {
Some(domain) => domain,
None => return,
};
let domain = match domain.downcast_ref::<ClientDomain>() {
Some(domain) => domain,
None => return,
};
if let Some(remote_window_id) = domain.local_to_remote_window_id(window_id) {
if let Some(workspace) = mux
.get_window(window_id)
.map(|w| w.get_workspace().to_string())
{
promise::spawn::spawn_into_main_thread(async move {
let request = codec::SetWindowWorkspace {
window_id: remote_window_id,
workspace,
};
let _ = update_remote_workspace(local_domain_id, request).await;
})
.detach();
}
}
}
})
.detach();
}
_ => {}
}