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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-05-24 03:02:40 +02:00
parent 690530e7aa
commit 41b6b82b24
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tasks/task_overlay.c
View File

@ -614,11 +614,20 @@ static void rarch_task_overlay_resolve_iterate(retro_task_t *task)
static void rarch_task_overlay_free(retro_task_t *task) static void rarch_task_overlay_free(retro_task_t *task)
{ {
unsigned i;
overlay_loader_t *loader = (overlay_loader_t*)task->state; overlay_loader_t *loader = (overlay_loader_t*)task->state;
if (loader->overlay_path) if (loader->overlay_path)
free(loader->overlay_path); free(loader->overlay_path);
if (task->cancelled)
{
for (i = 0; i < loader->size; i++)
input_overlay_free_overlay(&loader->overlays[i]);
free(loader->overlays);
}
if (loader->conf) if (loader->conf)
config_file_free(loader->conf); config_file_free(loader->conf);
@ -627,7 +636,6 @@ static void rarch_task_overlay_free(retro_task_t *task)
static void rarch_task_overlay_handler(retro_task_t *task) static void rarch_task_overlay_handler(retro_task_t *task)
{ {
overlay_task_data_t *data = NULL;
overlay_loader_t *loader = (overlay_loader_t*)task->state; overlay_loader_t *loader = (overlay_loader_t*)task->state;
switch (loader->state) switch (loader->state)
@ -642,7 +650,6 @@ static void rarch_task_overlay_handler(retro_task_t *task)
rarch_task_overlay_resolve_iterate(task); rarch_task_overlay_resolve_iterate(task);
break; break;
case OVERLAY_STATUS_DEFERRED_ERROR: case OVERLAY_STATUS_DEFERRED_ERROR:
task->error = strdup("Failed to load the overlay.");
task->cancelled = true; task->cancelled = true;
break; break;
case OVERLAY_STATUS_DEFERRED_DONE: case OVERLAY_STATUS_DEFERRED_DONE:
@ -652,23 +659,10 @@ static void rarch_task_overlay_handler(retro_task_t *task)
break; break;
} }
if (task->cancelled) if (task->finished && !task->cancelled)
{ {
unsigned i; overlay_task_data_t *data = (overlay_task_data_t*)
calloc(1, sizeof(*data));
if (task->error)
free(task->error);
task->error = strdup("Task cancelled.");
for (i = 0; i < loader->size; i++)
input_overlay_free_overlay(&loader->overlays[i]);
free(loader->overlays);
}
else if (task->finished)
{
data = (overlay_task_data_t*)calloc(1, sizeof(*data));
data->overlays = loader->overlays; data->overlays = loader->overlays;
data->size = loader->size; data->size = loader->size;
@ -676,11 +670,8 @@ static void rarch_task_overlay_handler(retro_task_t *task)
task->task_data = data; task->task_data = data;
} }
} }
static bool rarch_task_push_overlay_load(const char *overlay_path, static bool rarch_task_push_overlay_load(const char *overlay_path,
retro_task_callback_t cb, void *user_data) retro_task_callback_t cb, void *user_data)
{ {