xvideo: Fix order of context init

Current order causes an error in x11_input init and hence keyboard
doesn't work
This commit is contained in:
Vladimir Serbinenko 2020-05-23 04:36:17 +02:00
parent eaba575c9e
commit 9c4fde00ce

View File

@ -637,6 +637,12 @@ static void *xv_init(const video_info_t *video,
frontend_driver_install_signal_handler();
xv_init_yuv_tables(xv);
xv_init_font(xv, settings->paths.path_font, settings->floats.video_font_size);
if (!x11_input_ctx_new(true))
goto error;
if (input && input_data)
{
xinput = input_x.init(settings->arrays.input_joypad_driver);
@ -649,12 +655,6 @@ static void *xv_init(const video_info_t *video,
*input = NULL;
}
xv_init_yuv_tables(xv);
xv_init_font(xv, settings->paths.path_font, settings->floats.video_font_size);
if (!x11_input_ctx_new(true))
goto error;
XGetWindowAttributes(g_x11_dpy, g_x11_win, &target);
xv_calc_out_rect(xv->keep_aspect, &xv->vp, target.width, target.height);
xv->vp.full_width = target.width;