From ac1f17be3b7fdccb6d199ea7d4d0887aad24a0dd Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 3 Jun 2019 09:54:46 -0400 Subject: Revert "desktop: output: fix use-after-free in destroy" This reverts commit 46be87929fb01e68c4cc5a084dcaac5a71e72178. --- sway/desktop/output.c | 3 +-- 1 file changed, 1 insertion(+), 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) { static void handle_destroy(struct wl_listener *listener, void *data) { struct sway_output *output = wl_container_of(listener, output, destroy); - struct sway_server *server = output->server; wl_signal_emit(&output->events.destroy, output); if (output->enabled) { @@ -551,7 +550,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { transaction_commit_dirty(); - update_output_manager_config(server); + update_output_manager_config(output->server); } static void handle_mode(struct wl_listener *listener, void *data) { -- cgit v1.2.3-54-g00ecf