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

kms: Don't remove outputs from shell, before reading config

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-01-24 21:13:55 +01:00
parent 58f196d638
commit 7704f65d02
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/backend/kms/mod.rs
View file

@ -593,18 +593,22 @@ impl State {
.output_configuration_state .output_configuration_state
.add_heads(outputs_added.iter()); .add_heads(outputs_added.iter());
let seats = self.common.seats().cloned().collect::<Vec<_>>(); let seats = self.common.seats().cloned().collect::<Vec<_>>();
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&mut self.common.shell,
seats.iter().cloned(),
&self.common.event_loop_handle,
);
// Don't remove the outputs, before potentially new ones have been initialized.
// reading a new config means outputs might become enabled, that were previously disabled.
// If we have 0 outputs at some point, we won't quit, but shell doesn't know where to move
// windows and workspaces to.
for output in outputs_removed { for output in outputs_removed {
self.common self.common
.shell .shell
.remove_output(&output, seats.iter().cloned()); .remove_output(&output, seats.iter().cloned());
} }
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&mut self.common.shell,
seats.into_iter(),
&self.common.event_loop_handle,
);
Ok(()) Ok(())
} }