andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Don't unwrap client

Browse Source 
If Smithay posts an error, client will become None immediately, even
while the surface may still receive events.
This commit is contained in:
Ivan Molodetskikh
2024-05-05 11:14:46 +04:00
parent 65b9c74f62
commit df0ee996ee
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/compositor.rs
+14 -12
View File
@@ -59,19 +59,21 @@ impl CompositorHandler for State {
}); });
if let Some(dmabuf) = maybe_dmabuf { if let Some(dmabuf) = maybe_dmabuf {
if let Ok((blocker, source)) = dmabuf.generate_blocker(Interest::READ) { if let Ok((blocker, source)) = dmabuf.generate_blocker(Interest::READ) {
let client = surface.client().unwrap(); if let Some(client) = surface.client() {
let res = state let res =
.niri
.event_loop
.insert_source(source, move |_, _, state| {
let display_handle = state.niri.display_handle.clone();
state state
.client_compositor_state(&client) .niri
.blocker_cleared(state, &display_handle); .event_loop
Ok(()) .insert_source(source, move |_, _, state| {
}); let display_handle = state.niri.display_handle.clone();
if res.is_ok() { state
add_blocker(surface, blocker); .client_compositor_state(&client)
.blocker_cleared(state, &display_handle);
Ok(())
});
if res.is_ok() {
add_blocker(surface, blocker);
}
} }
} }
} }