From d7bfe70ca19dd7164799d8e726759e05439c706a Mon Sep 17 00:00:00 2001 From: Diablodiab Date: Mon, 30 May 2016 00:19:05 +0200 Subject: [PATCH] Check if content has been passed to core even if the core does not need content. Only start without content if no content has been passed. This fixes a problem with cores that are both able to start with or without content, eg. ScummVM. --- tasks/task_content.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tasks/task_content.c b/tasks/task_content.c index 4e501a49a5..6ee2601a26 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -1368,13 +1368,15 @@ static bool init_content_file_set_attribs( attr.i |= system->info.need_fullpath << 1; attr.i |= (!content_does_not_need_content()) << 2; - if (content_does_not_need_content() + char *fullpath = NULL; + + if (!runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath) + && content_does_not_need_content() && settings->set_supports_no_game_enable) string_list_append(content, "", attr); else { - char *fullpath = NULL; - if (runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath)) + if(fullpath) string_list_append(content, fullpath, attr); } }