mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(macOS AArch64/iOS ARM64) Fix crash when selecting cursor

Browse Source
This commit is contained in:
twinaphex 2021-03-22 01:17:09 +01:00
parent 882fc9bc2c
commit 4cf83880a6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/cbs/menu_cbs_deferred_push.c
View File

@ -274,11 +274,14 @@ static int deferred_push_cursor_manager_list_deferred(
if (!(conf = config_file_new_from_path_to_string(path))) if (!(conf = config_file_new_from_path_to_string(path)))
return -1; return -1;
query_entry = config_get_entry(conf, "query");
rdb_entry = config_get_entry(conf, "rdb");
if ( if (
!(query_entry = config_get_entry(conf, "query")) !query_entry
|| (string_is_empty(query_entry->value)) || (string_is_empty(query_entry->value))
|| !(rdb_entry = config_get_entry(conf, "rdb")) || !rdb_entry
|| (string_is_empty(rdb_entry->value)) || (string_is_empty(rdb_entry->value))
) )
{ {
@ -286,15 +289,14 @@ static int deferred_push_cursor_manager_list_deferred(
return -1; return -1;
} }
config_file_free(conf);
rdb_path[0] = '\0'; rdb_path[0] = '\0';
settings = config_get_ptr(); settings = config_get_ptr();
fill_pathname_join(rdb_path, fill_pathname_join(rdb_path,
settings->paths.path_content_database, settings->paths.path_content_database,
rdb_entry->value, sizeof(rdb_path)); rdb_entry->value, sizeof(rdb_path));
if (!string_is_empty(info->path_b)) if (!string_is_empty(info->path_b))
free(info->path_b); free(info->path_b);
@ -308,6 +310,8 @@ static int deferred_push_cursor_manager_list_deferred(
info->path_c = strdup(query_entry->value); info->path_c = strdup(query_entry->value);
info->path = strdup(rdb_path); info->path = strdup(rdb_path);
config_file_free(conf);
return deferred_push_dlist(info, DISPLAYLIST_DATABASE_QUERY, settings); return deferred_push_dlist(info, DISPLAYLIST_DATABASE_QUERY, settings);
} }