From 9c4fde00ce32e694c7075736ed9d19a533909233 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 23 May 2020 04:36:17 +0200 Subject: [PATCH] xvideo: Fix order of context init Current order causes an error in x11_input init and hence keyboard doesn't work --- gfx/drivers/xvideo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c index 2d14a1cb59..93f85185df 100644 --- a/gfx/drivers/xvideo.c +++ b/gfx/drivers/xvideo.c @@ -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;