leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Don't crash when the last output is removed

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-10-24 17:40:52 +02:00
parent 781427a74c
commit ffb7bcfc91
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/shell/mod.rs
View file

@ -838,7 +838,7 @@ impl Workspaces {
}
pub fn active(&self, output: &Output) -> (Option<(&Workspace, Instant)>, &Workspace) {
let set = self.sets.get(output).unwrap();
let set = self.sets.get(output).or(self.backup_set.as_ref()).unwrap();
(
set.previously_active
.map(|(idx, start)| (&set.workspaces[idx], start)),
@ -847,12 +847,16 @@ impl Workspaces {
}
pub fn active_mut(&mut self, output: &Output) -> &mut Workspace {
let set = self.sets.get_mut(output).unwrap();
let set = self
.sets
.get_mut(output)
.or(self.backup_set.as_mut())
.unwrap();
&mut set.workspaces[set.active]
}
pub fn active_num(&self, output: &Output) -> (Option<usize>, usize) {
let set = self.sets.get(output).unwrap();
let set = self.sets.get(output).or(self.backup_set.as_ref()).unwrap();
(set.previously_active.map(|(idx, _)| idx), set.active)
}