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

Merge pull request #2478 from heuripedes/master

Browse Source 
(menu) Don't lock the user inside the content/core downloader menu
This commit is contained in:
Twinaphex 2015-11-27 17:49:52 +01:00
commit 1bd8e6402a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/cbs/menu_cbs_deferred_push.c
View File

@ -299,12 +299,15 @@ void cb_net_generic(void *task_data, void *user_data, const char *err)
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
http_transfer_data_t *data = (http_transfer_data_t*)task_data; http_transfer_data_t *data = (http_transfer_data_t*)task_data;
if (!menu || !data || err)
goto finish;
if (core_buf) if (core_buf)
free(core_buf); free(core_buf);
core_buf = NULL;
core_len = 0;
if (!menu || !data || err)
goto finish;
core_buf = (char*)malloc((data->len+1) * sizeof(char)); core_buf = (char*)malloc((data->len+1) * sizeof(char));
if (!core_buf) if (!core_buf)
@ -314,9 +317,9 @@ void cb_net_generic(void *task_data, void *user_data, const char *err)
core_buf[data->len] = '\0'; core_buf[data->len] = '\0';
core_len = data->len; core_len = data->len;
finish:
menu_entries_unset_refresh(true); menu_entries_unset_refresh(true);
finish:
if (err) if (err)
RARCH_ERR("Download failed: %s\n", err); RARCH_ERR("Download failed: %s\n", err);

3
menu/menu_displaylist.c
View File

@ -55,6 +55,9 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
int i, j = 0; int i, j = 0;
char *line_start = buf; char *line_start = buf;
if (!buf)
menu_entries_push(list, "No entries to display.", "", MENU_FILE_NONE, 0, 0);
for (i = 0; i < buf_size; i++) for (i = 0; i < buf_size; i++)
{ {
size_t ln; size_t ln;