pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tabs): dont panic when tab history is empty and closing tab (#990)

Browse source
This commit is contained in:
Aram Drevekenin 2022-01-04 11:07:09 +01:00 • committed by GitHub
parent 4496c4d4dc
commit d5fe53ef57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zellij-server/src/screen.rs
View file

@ -237,8 +237,11 @@ impl Screen {
&mut self, &mut self,
client_ids_and_mode_infos: Vec<(ClientId, ModeInfo)>, client_ids_and_mode_infos: Vec<(ClientId, ModeInfo)>,
) { ) {
// this will panic if there are no more tabs (ie. if self.tabs.is_empty() == true)
for (client_id, client_mode_info) in client_ids_and_mode_infos { for (client_id, client_mode_info) in client_ids_and_mode_infos {
let client_previous_tab = self.tab_history.get_mut(&client_id).unwrap().pop().unwrap(); let client_tab_history = self.tab_history.entry(client_id).or_insert_with(Vec::new);
match client_tab_history.pop() {
Some(client_previous_tab) => {
self.active_tab_indices self.active_tab_indices
.insert(client_id, client_previous_tab); .insert(client_id, client_previous_tab);
self.tabs self.tabs
@ -246,6 +249,16 @@ impl Screen {
.unwrap() .unwrap()
.add_client(client_id, Some(client_mode_info)); .add_client(client_id, Some(client_mode_info));
} }
None => {
let next_tab_index = *self.tabs.keys().next().unwrap();
self.active_tab_indices.insert(client_id, next_tab_index);
self.tabs
.get_mut(&next_tab_index)
.unwrap()
.add_client(client_id, Some(client_mode_info));
}
}
}
} }
fn move_clients_between_tabs( fn move_clients_between_tabs(
&mut self, &mut self,