From 06eb09384bc71d0667a4af7da2d13992cbfaf1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Sat, 25 Nov 2023 18:52:09 -0600 Subject: [PATCH] destroy output and return if first commit fails rather than leave the monitor half-initialized Bug: https://codeberg.org/dwl/dwl/issues/527 --- dwl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dwl.c b/dwl.c index 6a96179..411d5f3 100644 --- a/dwl.c +++ b/dwl.c @@ -899,15 +899,17 @@ createmon(struct wl_listener *listener, void *data) * the user configure it. */ wlr_output_set_mode(wlr_output, wlr_output_preferred_mode(wlr_output)); + wlr_output_enable(wlr_output, 1); + if (!wlr_output_commit(wlr_output)) { + wlr_output_destroy(wlr_output); + return; + } + /* Set up event listeners */ LISTEN(&wlr_output->events.frame, &m->frame, rendermon); LISTEN(&wlr_output->events.destroy, &m->destroy, cleanupmon); LISTEN(&wlr_output->events.request_state, &m->request_state, requestmonstate); - wlr_output_enable(wlr_output, 1); - if (!wlr_output_commit(wlr_output)) - return; - wl_list_insert(&mons, &m->link); printstatus();