Merge pull request #7090 from Dwedit/fix_missing_content

Fix console mode loading core without content
This commit is contained in:
Twinaphex 2018-08-18 16:06:41 +02:00 committed by GitHub
commit f07b8b1965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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