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

Merge pull request #2498 from heuripedes/master

Browse Source 
stuff
This commit is contained in:
Twinaphex 2015-11-30 17:04:13 +01:00
commit 0637671725
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
menu/menu.c
View File

@ -209,6 +209,26 @@ void menu_free(menu_handle_t *menu)
free(menu);
}
#if 0
static void bundle_decompressed(void *task_data, void *user_data, const char *err)
{
decompress_task_data_t *dec = (decompress_task_data_t*)task_data;
if (dec && !err)
event_command(EVENT_CMD_REINIT);
if (err)
RARCH_ERR("%s", err);
if (dec)
{
/* delete bundle? */
free(dec->source_file);
free(dec);
}
}
#endif
/**
* menu_init:
* @data : Menu context handle.
@ -250,16 +270,14 @@ void *menu_init(const void *data)
menu->help_screen_type = MENU_HELP_WELCOME;
settings->menu_show_start_screen = false;
/* TODO/FIXME - Update to newer tasks */
/* FIXME: figure out bundle_path */
#if 0
if (settings->bundle_assets_extract_enable &&
(strcmp(PACKAGE_VERSION, settings->bundle_assets_last_extracted_version) != 0)
)
{
menu->push_help_screen = true;
menu->help_screen_type = MENU_HELP_EXTRACT;
rarch_main_data_msg_queue_push(DATA_TYPE_FILE, "cb_bundle_extract", "cb_bundle_extract", 0, 1, true);
rarch_task_push_decompress(bundle_path, settings->core_assets_directory, NULL,
bundle_decompressed);
}
#endif

4
tasks/tasks.c
View File

@ -87,9 +87,9 @@ static void push_task_progress(rarch_task_t *task)
else
{
if (task->progress >= 0 && task->progress <= 100)
rarch_main_msg_queue_pushf(1, 10, true, "%i%%: %s", task->progress, task->title);
rarch_main_msg_queue_pushf(1, 60, true, "%i%%: %s", task->progress, task->title);
else
rarch_main_msg_queue_pushf(1, 10, true, "%s...", task->title);
rarch_main_msg_queue_pushf(1, 60, true, "%s...", task->title);
}
}
}