Revert "desktop: output: fix use-after-free in destroy"

This reverts commit 46be87929f.
This commit is contained in:
Drew DeVault 2019-06-03 09:54:46 -04:00
parent 46be87929f
commit ac1f17be3b

View file

@ -533,7 +533,6 @@ static void update_output_manager_config(struct sway_server *server) {
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, destroy); struct sway_output *output = wl_container_of(listener, output, destroy);
struct sway_server *server = output->server;
wl_signal_emit(&output->events.destroy, output); wl_signal_emit(&output->events.destroy, output);
if (output->enabled) { if (output->enabled) {
@ -551,7 +550,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
transaction_commit_dirty(); transaction_commit_dirty();
update_output_manager_config(server); update_output_manager_config(output->server);
} }
static void handle_mode(struct wl_listener *listener, void *data) { static void handle_mode(struct wl_listener *listener, void *data) {