diff options
| author | Christian Meissl <meissl.christian@gmail.com> | 2024-07-05 21:49:08 +0200 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2024-07-08 08:30:00 +0300 |
| commit | 570bf1cb3c1f9ffc847359009c6061e062c72871 (patch) | |
| tree | f087b302e1f25c61556170735fe9a70fe14ce9bb /src/handlers | |
| parent | 6ec9c72539684ed409427649a11837ab56a0250c (diff) | |
| download | niri-570bf1cb3c1f9ffc847359009c6061e062c72871.tar.gz niri-570bf1cb3c1f9ffc847359009c6061e062c72871.tar.bz2 niri-570bf1cb3c1f9ffc847359009c6061e062c72871.zip | |
bump smithay
Diffstat (limited to 'src/handlers')
| -rw-r--r-- | src/handlers/compositor.rs | 3 | ||||
| -rw-r--r-- | src/handlers/xdg_shell.rs | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/handlers/compositor.rs b/src/handlers/compositor.rs index 34030124..583e88bd 100644 --- a/src/handlers/compositor.rs +++ b/src/handlers/compositor.rs @@ -50,7 +50,8 @@ impl CompositorHandler for State { let maybe_dmabuf = with_states(surface, |surface_data| { surface_data .cached_state - .pending::<SurfaceAttributes>() + .get::<SurfaceAttributes>() + .pending() .buffer .as_ref() .and_then(|assignment| match assignment { diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs index 73eb01e9..4dc353b5 100644 --- a/src/handlers/xdg_shell.rs +++ b/src/handlers/xdg_shell.rs @@ -1006,8 +1006,10 @@ pub fn add_mapped_toplevel_pre_commit_hook(toplevel: &ToplevelSurface) -> HookId }; let (got_unmapped, commit_serial) = with_states(surface, |states| { - let attrs = states.cached_state.pending::<SurfaceAttributes>(); - let got_unmapped = matches!(attrs.buffer, Some(BufferAssignment::Removed)); + let got_unmapped = { + let mut guard = states.cached_state.get::<SurfaceAttributes>(); + matches!(guard.pending().buffer, Some(BufferAssignment::Removed)) + }; let role = states .data_map |