Skip to content

Commit

Permalink
layer-shell: check committed bitmask
Browse files Browse the repository at this point in the history
This avoids infinite configure-ack_configure-commit loop.
  • Loading branch information
Kirill Primak authored and emersion committed Sep 24, 2021
1 parent b7b3ef6 commit c11b5db
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions sway/desktop/layer_shell.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
if (wlr_output == NULL) {
return;
}
if (layer_surface->current.committed == 0) {
// The layer surface state didn't change
return;
}

struct sway_output *output = wlr_output->data;
struct wlr_box old_extent = layer->extent;
Expand Down

5 comments on commit c11b5db

@ErikReider
Copy link
Contributor

@ErikReider ErikReider commented on c11b5db Sep 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to mess with everything that uses layer-shell. Rofi, waybar are all wonky after this commit. Nothing seems to update correctly

@escalade
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having weird issues with lavalauncher after this too.

@emersion
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These issues have been fixed in #6551.

@escalade
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't seem like it, lavalauncher keeps blinking on startup. Rolling back to b7b3ef6 and everything is good.

@emersion
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please open a bug report.

Please sign in to comment.