diff options
| -rw-r--r-- | river/Root.zig | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/river/Root.zig b/river/Root.zig index 2431bda..5f600e2 100644 --- a/river/Root.zig +++ b/river/Root.zig @@ -282,6 +282,7 @@ pub fn startTransaction(self: *Self) void { // If a new transaction is started while another is in progress, we need // to reset the pending count to 0 and clear serials from the views + const preempting = self.pending_configures > 0; self.pending_configures = 0; // Iterate over all views of all outputs @@ -317,16 +318,18 @@ pub fn startTransaction(self: *Self) void { } if (self.pending_configures > 0) { - std.log.scoped(.transaction).debug( - "started transaction with {} pending configure(s)", - .{self.pending_configures}, - ); - - // Set timeout to 200ms - self.transaction_timer.timerUpdate(200) catch { - std.log.scoped(.transaction).err("failed to update timer", .{}); - self.commitTransaction(); - }; + std.log.scoped(.transaction).debug("started transaction with {} pending configure(s)", .{ + self.pending_configures, + }); + + // Timeout the transaction after 200ms. If we are preempting an + // already in progress transaction, don't extend the timeout. + if (!preempting) { + self.transaction_timer.timerUpdate(200) catch { + std.log.scoped(.transaction).err("failed to update timer", .{}); + self.commitTransaction(); + }; + } } else { // No views need configures, clear the current timer in case we are // interrupting another transaction and commit. |