libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-12-03 22:03:04 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #8055 from fr500/master

Browse Source 
this should fix errors with --disable-menu
This commit is contained in:
Twinaphex 2019-01-21 00:40:17 +01:00 committed by GitHub
commit d2863e2ce6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/task_content.c
View File

@ -1698,7 +1698,6 @@ bool task_push_load_content_with_current_core_from_companion_ui(
return true;
}
#ifdef HAVE_MENU
bool task_push_load_content_with_core_from_menu(
const char *fullpath,
content_ctx_info_t *content_info,
@ -1716,9 +1715,11 @@ bool task_push_load_content_with_core_from_menu(
return false;
}
#ifdef HAVE_MENU
/* Push quick menu onto menu stack */
if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif
return true;
}
@ -1740,14 +1741,16 @@ bool task_push_load_subsystem_with_core_from_menu(
return false;
}
#ifdef HAVE_MENU
/* Push quick menu onto menu stack */
if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif
return true;
}
#endif
void content_get_status(
bool *contentless,

2
tasks/task_content.h
View File

@ -97,6 +97,7 @@ bool task_push_load_content_from_playlist_from_menu(
content_ctx_info_t *content_info,
retro_task_callback_t cb,
void *user_data);
#endif
bool task_push_load_content_with_core_from_menu(
const char *fullpath,
@ -110,7 +111,6 @@ bool task_push_load_subsystem_with_core_from_menu(
enum rarch_core_type type,
retro_task_callback_t cb,
void *user_data);
#endif
RETRO_END_DECLS

12
tasks/task_netplay_find_content.c
View File

@ -86,7 +86,6 @@ static void netplay_crc_scan_callback(void *task_data,
return;
}
#ifdef HAVE_MENU
/* regular core with content file */
if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path)
&& !state->contentless && !state->current)
@ -103,12 +102,17 @@ static void netplay_crc_scan_callback(void *task_data,
state->content_path, &content_info,
CORE_TYPE_PLAIN, NULL, NULL);
else
task_push_load_content_with_new_core_from_menu(
state->core_path, state->content_path,
{
task_push_load_new_core(state->core_path, NULL,
&content_info, CORE_TYPE_PLAIN, NULL, NULL);
task_push_load_content_with_core_from_menu(
state->content_path, &content_info,
CORE_TYPE_PLAIN, NULL, NULL);
}
}
else
#endif
/* contentless core */
if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path)
&& state->contentless)