From 48396a1bf8ce4282c4fc76d853195e1026caf7d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
<leohdz172@protonmail.com>
Date: Thu, 11 Aug 2022 15:25:13 -0500
Subject: fix crash when setting a custom mode
---
dwl.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/dwl.c b/dwl.c
index 7d53ab9..5031e0a 100644
--- a/dwl.c
+++ b/dwl.c
@@ -1621,7 +1621,23 @@ outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test)
ok &= wlr_output_test(wlr_output);
wlr_output_rollback(wlr_output);
} else {
- ok &= wlr_output_commit(wlr_output);
+ 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)
+ 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);
}
}
--
cgit v1.2.3