diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-06-03 09:54:46 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-06-03 09:54:46 -0400 |
commit | ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd (patch) | |
tree | 5abb4d4ac423790906caed48c9680b88949e087e | |
parent | desktop: output: fix use-after-free in destroy (diff) | |
download | sway-ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd.tar.gz sway-ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd.tar.zst sway-ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd.zip |
Revert "desktop: output: fix use-after-free in destroy"
This reverts commit 46be87929fb01e68c4cc5a084dcaac5a71e72178.
-rw-r--r-- | sway/desktop/output.c | 3 |
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 | ||
534 | static void handle_destroy(struct wl_listener *listener, void *data) { | 534 | static 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 | ||
557 | static void handle_mode(struct wl_listener *listener, void *data) { | 556 | static void handle_mode(struct wl_listener *listener, void *data) { |