toby/dwl
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix crash when setting a custom mode

Browse source
This commit is contained in:
Leonardo Hernández Hernández 2022-08-11 15:25:13 -05:00 committed by Leonardo Hernández
parent b6e3fc1645
commit 48396a1bf8
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dwl.c
View file

@ -1621,7 +1621,23 @@ outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test)
ok &= wlr_output_test(wlr_output); ok &= wlr_output_test(wlr_output);
wlr_output_rollback(wlr_output); wlr_output_rollback(wlr_output);
} else { } 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)
ok &= (output_ok = wlr_output_test(wlr_output)
&& wlr_output_commit(wlr_output));
else
ok &= wlr_output_commit(wlr_output); 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);
} }
} }