mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check the return value of wlr_output_layout_get() for NULL

Browse source 
wlr_output_layout_get() seems to return NULL for disabled outputs.

Fixes: #174
This commit is contained in:
John Lindgren 2021-12-24 15:53:49 -05:00 • committed by Johan Malm
parent 46bd0d549f
commit 2ce961a0bd
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/output.c
View file

@ -526,6 +526,10 @@ render_osd(struct output *output, pixman_region32_t *damage,
struct wlr_output_layout_output *ol_output; struct wlr_output_layout_output *ol_output;
wl_list_for_each(o, &server->outputs, link) { wl_list_for_each(o, &server->outputs, link) {
ol_output = wlr_output_layout_get(layout, o->wlr_output); ol_output = wlr_output_layout_get(layout, o->wlr_output);
if (!ol_output) {
continue;
}
struct wlr_box box = { struct wlr_box box = {
.x = ol_output->x + o->wlr_output->width .x = ol_output->x + o->wlr_output->width
/ o->wlr_output->scale / 2, / o->wlr_output->scale / 2,

4
src/view.c
View file

@ -125,6 +125,10 @@ view_center(struct view *view)
struct wlr_output_layout *layout = view->server->output_layout; struct wlr_output_layout *layout = view->server->output_layout;
struct wlr_output_layout_output *ol_output = struct wlr_output_layout_output *ol_output =
wlr_output_layout_get(layout, wlr_output); wlr_output_layout_get(layout, wlr_output);
if (!ol_output) {
return;
}
int center_x = ol_output->x + wlr_output->width / wlr_output->scale / 2; int center_x = ol_output->x + wlr_output->width / wlr_output->scale / 2;
int center_y = ol_output->y + wlr_output->height / wlr_output->scale / 2; int center_y = ol_output->y + wlr_output->height / wlr_output->scale / 2;
view_move(view, center_x - view->w / 2, center_y - view->h / 2); view_move(view, center_x - view->w / 2, center_y - view->h / 2);