mirror of
https://github.com/swaywm/sway.git
synced 2024-11-22 07:51:28 +00:00
Revert "desktop: output: fix use-after-free in destroy"
This reverts commit 46be87929f
.
This commit is contained in:
parent
46be87929f
commit
ac1f17be3b
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue