Skip to content

wayland: handle null output in wl_surface.enter event #18346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
llyyr wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

wayland: handle null output in wl_surface.enter event #18346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions video/out/wayland_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,9 +1687,13 @@ static void surface_handle_enter(void *data, struct wl_surface *wl_surface,
if (outputs == 1)
update_output_geometry(wl);

MP_VERBOSE(wl, "Surface entered output %s %s (%s) (0x%x), scale = %f, refresh rate = %f Hz\n",
wl->current_output->make, wl->current_output->model, wl->current_output->name,
wl->current_output->id, wl->scaling_factor, wl->current_output->refresh_rate);
if (wl->current_output) {
MP_VERBOSE(wl, "Surface entered output %s %s (%s) (0x%x), scale = %f, refresh rate = %f Hz\n",
wl->current_output->make, wl->current_output->model, wl->current_output->name,
wl->current_output->id, wl->scaling_factor, wl->current_output->refresh_rate);
} else {
MP_VERBOSE(wl, "Surface entered unknown output\n");
}

wl->pending_vo_events |= VO_EVENT_WIN_STATE;
}
Expand Down Expand Up @@ -4105,7 +4109,8 @@ static void update_output_geometry(struct vo_wayland_state *wl)
force_resize = true;
}

if (!mp_rect_equals(&wl->old_output_geometry, &wl->current_output->geometry)) {
if (wl->current_output &&
!mp_rect_equals(&wl->old_output_geometry, &wl->current_output->geometry)) {
set_geometry(wl, false);
force_resize = true;
}
Expand Down
Loading