From 869800dc0431b6214f74e4cabc4d3756147f4586 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 29 Nov 2016 00:49:22 -0500 Subject: [PATCH] Only block loading for CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU and only when a system dir is properly configured --- menu/cbs/menu_cbs_ok.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index abeacb5009..1400a4c8ca 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -854,7 +854,11 @@ static int generic_action_ok_file_load(const char *corepath, const char *fullpat enum rarch_core_type action_type, enum content_mode_load content_enum_idx) { content_ctx_info_t content_info = {0}; - if(runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL)) + settings_t *settings = config_get_ptr(); + + if(runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL) + && !string_is_empty(settings->directory.system) + && content_enum_idx == CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU) { runloop_msg_queue_push(msg_hash_to_str(MSG_FIRMWARE), 200, 100, true); RARCH_LOG(msg_hash_to_str(MSG_FIRMWARE));