output: send commit event after pending state is cleared

References: https://github.com/swaywm/wlroots/issues/2098

1 files changed, 9 insertions, 7 deletions

diff --git a/types/wlr_output.c b/types/wlr_output.c
index 4721f0b9..9790691a 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -612,13 +612,6 @@ bool wlr_output_commit(struct wlr_output *output) {
 
 	output->commit_seq++;
 
-	struct wlr_output_event_commit event = {
-		.output = output,
-		.committed = output->pending.committed,
-		.when = &now,
-	};
-	wlr_signal_emit_safe(&output->events.commit, &event);
-
 	bool scale_updated = output->pending.committed & WLR_OUTPUT_STATE_SCALE;
 	if (scale_updated) {
 		output->scale = output->pending.scale;
@@ -649,7 +642,16 @@ bool wlr_output_commit(struct wlr_output *output) {
 		output->needs_frame = false;
 	}
 
+	uint32_t committed = output->pending.committed;
 	output_state_clear(&output->pending);
+
+	struct wlr_output_event_commit event = {
+		.output = output,
+		.committed = committed,
+		.when = &now,
+	};
+	wlr_signal_emit_safe(&output->events.commit, &event);
+
 	return true;
 }