diff options
| -rw-r--r-- | video/out/wayland_common.c | 13 | ||||
| -rw-r--r-- | video/out/x11_common.c | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 6810069d4f..72bacad15d 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -1370,6 +1370,7 @@ static int set_cursor_visibility(struct vo_wayland_state *wl, bool on) static void set_geometry(struct vo_wayland_state *wl) { struct vo *vo = wl->vo; + assert(wl->current_output); struct vo_win_geometry geo; struct mp_rect screenrc = wl->current_output->geometry; @@ -1597,11 +1598,13 @@ int vo_wayland_control(struct vo *vo, int *events, int request, void *arg) if (opt == &opts->geometry || opt == &opts->autofit || opt == &opts->autofit_smaller || opt == &opts->autofit_larger) { - set_geometry(wl); - wl->window_size = wl->vdparams; - if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized) - wl->geometry = wl->window_size; - wl->pending_vo_events |= VO_EVENT_RESIZE; + if (wl->current_output) { + set_geometry(wl); + wl->window_size = wl->vdparams; + if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized) + wl->geometry = wl->window_size; + wl->pending_vo_events |= VO_EVENT_RESIZE; + } } } return VO_TRUE; diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 2e685e2297..fe27483f0a 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -1847,6 +1847,9 @@ static void vo_x11_set_geometry(struct vo *vo) { struct vo_x11_state *x11 = vo->x11; + if (!x11->window) + return; + if (x11->opts->window_maximized) { x11->pending_geometry_change = true; } else { |