aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2019-06-03 09:54:46 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-06-03 09:54:46 -0400
commitac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd (patch)
tree5abb4d4ac423790906caed48c9680b88949e087e
parentdesktop: output: fix use-after-free in destroy (diff)
downloadsway-ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd.tar.gz
sway-ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd.tar.zst
sway-ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd.zip
Revert "desktop: output: fix use-after-free in destroy"
-rw-r--r--sway/desktop/output.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index f8d831d3..1b72fc21 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -533,7 +533,6 @@ static void update_output_manager_config(struct sway_server *server) {
533 533
534static void handle_destroy(struct wl_listener *listener, void *data) { 534static void handle_destroy(struct wl_listener *listener, void *data) {
535 struct sway_output *output = wl_container_of(listener, output, destroy); 535 struct sway_output *output = wl_container_of(listener, output, destroy);
536 struct sway_server *server = output->server;
537 wl_signal_emit(&output->events.destroy, output); 536 wl_signal_emit(&output->events.destroy, output);
538 537
539 if (output->enabled) { 538 if (output->enabled) {
@@ -551,7 +550,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
551 550
552 transaction_commit_dirty(); 551 transaction_commit_dirty();
553 552
554 update_output_manager_config(server); 553 update_output_manager_config(output->server);
555} 554}
556 555
557static void handle_mode(struct wl_listener *listener, void *data) { 556static void handle_mode(struct wl_listener *listener, void *data) {