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

surface: Don't crash due to weird state after resume

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-08-08 21:39:34 +02:00 • committed by Victoria Brekenfeld
parent 77d3605fb9
commit 7c3e18b588
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/backend/kms/surface/mod.rs
View file

@ -746,8 +746,27 @@ impl SurfaceThreadState {
let Some(compositor) = self.compositor.as_mut() else {
return;
};
// handle edge-cases right after resume
if !matches!(
self.state,
QueueState::WaitingForVBlank { .. } | QueueState::Idle
) {
match mem::replace(&mut self.state, QueueState::Idle) {
QueueState::WaitingForVBlank { .. } | QueueState::Idle => unreachable!(),
QueueState::Queued(token) | QueueState::WaitingForEstimatedVBlank(token) => {
self.loop_handle.remove(token);
}
QueueState::WaitingForEstimatedVBlankAndQueued {
estimated_vblank,
queued_render,
} => {
self.loop_handle.remove(estimated_vblank);
self.loop_handle.remove(queued_render);
}
}
}
if matches!(self.state, QueueState::Idle) {
// can happen right after resume
return;
}