From 448a96de13042c76634c2a898c370889b33693d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Sun, 30 Oct 2022 01:03:44 -0500 Subject: remove now unneeded workaround in outputmgrapplyortest() --- dwl.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'dwl.c') diff --git a/dwl.c b/dwl.c index 8b019da..fa59386 100644 --- a/dwl.c +++ b/dwl.c @@ -1562,23 +1562,7 @@ apply_or_test: ok &= wlr_output_test(wlr_output); wlr_output_rollback(wlr_output); } else { - int output_ok = 1; - /* If it's a custom mode to avoid an assertion failed in wlr_output_commit() - * we test if that mode does not fail rather than just call wlr_output_commit(). - * We do not test normal modes because (at least in my hardware (@sevz17)) - * wlr_output_test() fails even if that mode can actually be set */ - if (!config_head->state.mode && config_head->state.enabled) - ok &= (output_ok = wlr_output_test(wlr_output) - && wlr_output_commit(wlr_output)); - else - ok &= wlr_output_commit(wlr_output); - - /* In custom modes we call wlr_output_test(), it it fails - * we need to rollback, and normal modes seems to does not cause - * assertions failed in wlr_output_commit() which rollback - * the output on failure */ - if (!output_ok) - wlr_output_rollback(wlr_output); + ok &= wlr_output_commit(wlr_output); } } -- cgit v1.2.3