Merge pull request #1670 from heuripedes/master

(gl) Fix font rendering when video_font_enable=false
This commit is contained in:
Twinaphex 2015-05-03 03:44:05 +02:00
commit cb31d06c99
1 changed files with 5 additions and 2 deletions

View File

@ -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);
}
}