From 5bfd910cd17fbc94d43b291964ba8105237158ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Sat, 2 May 2015 22:41:44 -0300 Subject: [PATCH] (gl) Fix font rendering when video_font_enable=false --- gfx/drivers/gl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 17f24ca023..ba97a44343 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -3142,10 +3142,13 @@ static void gl_set_osd_msg(void *data, const char *msg, font_driver = (const struct font_renderer*)driver->font_osd_driver; - if (driver->font_osd_driver && driver->font_osd_data) + if (!font) + font = driver->font_osd_data; + + if (driver->font_osd_driver && font) { context_bind_hw_render(gl, false); - font_driver->render_msg(font ? font : driver->font_osd_data, msg, params); + font_driver->render_msg(font, msg, params); context_bind_hw_render(gl, true); } }