Merge pull request #9848 from BarryJRowe/master

Fixed a segfault and an issue with AI Service overlay's image mode.
This commit is contained in:
Twinaphex 2019-12-13 07:04:25 +01:00 committed by GitHub
commit 73729e7a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View File

@ -1354,6 +1354,7 @@ void menu_widgets_frame(video_frame_info_t *video_info)
0.00, 1.00, 0.00, 1.00,
0.00, 1.00, 0.00, 1.00,
};
menu_display_set_alpha(menu_widgets_pure_white, 1.0f);
menu_widgets_draw_icon_blend(video_info,
video_info->width, video_info->height,

View File

@ -4180,6 +4180,11 @@ static void handle_translation_cb(
if (string_is_equal(error_string, "No text found."))
{
RARCH_LOG("No text found...\n");
if (!text_string)
{
text_string = (char*)malloc(15);
}
strlcpy(text_string, error_string, 15);
#ifdef HAVE_MENU_WIDGETS
if (menu_widgets_paused)