From 0e34c12d5c8ea2f861dc29df240c1dc68657d2cf Mon Sep 17 00:00:00 2001 From: Dwedit Date: Sat, 18 Aug 2018 08:40:19 -0500 Subject: [PATCH] Fixed bug that let Retroarch proceed to retro_run without loading content Removed unlocalized and redundant error message --- tasks/task_content.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tasks/task_content.c b/tasks/task_content.c index 4ca0f0ba67..e67de039d3 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -814,6 +814,11 @@ static bool content_file_init( free(info); } + else if (special == NULL) + { + *error_string = strdup(msg_hash_to_str(MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT)); + ret = false; + } return ret; } @@ -874,7 +879,6 @@ static bool task_load_content(content_ctx_info_t *content_info, if (!content_load(content_info)) { - *error_string = strdup("This core requires a content file, could not load content.\n"); return false; }