From 470eb222803a6382fd444e133b675fcc168fbf60 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 20 Jun 2023 15:26:29 +0200 Subject: [PATCH] river-layout: Remove incorrect assertion This assertion is not correct since removing transaction preemption. --- river/LayoutDemand.zig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/river/LayoutDemand.zig b/river/LayoutDemand.zig index a127938..599a642 100644 --- a/river/LayoutDemand.zig +++ b/river/LayoutDemand.zig @@ -98,6 +98,8 @@ pub fn pushViewDimensions(self: *Self, x: i32, y: i32, width: u31, height: u31) /// Apply the proposed layout to the output pub fn apply(self: *Self, layout: *Layout) void { + // Note: output.layout may not be equal to layout here if the layout + // namespace changes while a transactions is inflight. const output = layout.output; // Whether the layout demand succeeds or fails, we are done with it and @@ -152,5 +154,4 @@ pub fn apply(self: *Self, layout: *Layout) void { } } assert(i == self.view_boxen.len); - assert(output.layout == layout); }