diff options
| author | emersion <contact@emersion.fr> | 2019-02-16 23:30:19 +0100 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-16 19:11:22 -0500 |
| commit | 7baaa3a0f80a28f58a3f95f7c3c832cb109b2aab (patch) | |
| tree | d2596353b9badb5e0d0709fb9ed67ad1edb9e7ec /sway/desktop | |
| parent | 806129d3ccef1075e178791c56159e08e868bcaf (diff) | |
| download | sway-7baaa3a0f80a28f58a3f95f7c3c832cb109b2aab.tar.xz | |
Disconnect swaybg instead of killing it
This is much more reliable. This also fixes race conditions when killing swaybg
while it's doing a wl_display_roundtrip.
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ad75bb35..c5461ee6 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -506,6 +506,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&output->present.link); wl_list_remove(&output->damage_destroy.link); wl_list_remove(&output->damage_frame.link); + wl_list_remove(&output->swaybg_client_destroy.link); transaction_commit_dirty(); } @@ -612,6 +613,7 @@ void handle_new_output(struct wl_listener *listener, void *data) { output->damage_frame.notify = damage_handle_frame; wl_signal_add(&output->damage->events.destroy, &output->damage_destroy); output->damage_destroy.notify = damage_handle_destroy; + wl_list_init(&output->swaybg_client_destroy.link); struct output_config *oc = output_find_config(output); if (!oc || oc->enabled) { |