mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: fix assert when re-adding output to layout

Browse source 
wlr_scene_output_layout_add_output() aborts when called with an
already-added output.

To reproduce, run wlr-randr to reconfigure one of the enabled
outputs.
This commit is contained in:
Simon Ser 2024-02-16 16:54:36 +01:00
parent 767ccf9bbd
commit d07afac4ae
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
output.c
View file

@ -80,8 +80,12 @@ static inline void
output_layout_add(struct cg_output *output, int32_t x, int32_t y) output_layout_add(struct cg_output *output, int32_t x, int32_t y)
{ {
assert(output->scene_output != NULL); assert(output->scene_output != NULL);
bool exists = wlr_output_layout_get(output->server->output_layout, output->wlr_output);
struct wlr_output_layout_output *layout_output = struct wlr_output_layout_output *layout_output =
wlr_output_layout_add(output->server->output_layout, output->wlr_output, x, y); wlr_output_layout_add(output->server->output_layout, output->wlr_output, x, y);
if (exists) {
return;
}
wlr_scene_output_layout_add_output(output->server->scene_output_layout, layout_output, output->scene_output); wlr_scene_output_layout_add_output(output->server->scene_output_layout, layout_output, output->scene_output);
} }