aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Hernández Hernández <leohdz172@protonmail.com>2022-10-30 01:03:44 -0500
committerLeonardo Hernández Hernández <leohdz172@protonmail.com>2022-10-30 01:03:44 -0500
commit448a96de13042c76634c2a898c370889b33693d0 (patch)
tree32f21045bb572b5ece586e12899b136484d0a4b9
parent99f062273e6a04abe4258c23284087698a8ecad8 (diff)
remove now unneeded workaround in outputmgrapplyortest()
-rw-r--r--dwl.c18
1 files changed, 1 insertions, 17 deletions
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);
}
}