ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2016-05-24 02:55:27 +02:00
parent 47c2b9ed43
commit 0f42249dd5
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasks/task_overlay.c
View File

@ -643,23 +643,15 @@ static void rarch_task_overlay_handler(retro_task_t *task)
break; break;
case OVERLAY_STATUS_DEFERRED_ERROR: case OVERLAY_STATUS_DEFERRED_ERROR:
task->error = strdup("Failed to load the overlay."); task->error = strdup("Failed to load the overlay.");
task->cancelled = true;
break;
case OVERLAY_STATUS_DEFERRED_DONE: case OVERLAY_STATUS_DEFERRED_DONE:
default: default:
case OVERLAY_STATUS_NONE: case OVERLAY_STATUS_NONE:
task->finished = true; task->finished = true;
goto task_finished; break;
} }
if (task->cancelled)
{
task->finished = true;
goto task_finished;
}
return;
task_finished:
if (task->cancelled) if (task->cancelled)
{ {
unsigned i; unsigned i;
@ -673,6 +665,7 @@ task_finished:
input_overlay_free_overlay(&loader->overlays[i]); input_overlay_free_overlay(&loader->overlays[i]);
free(loader->overlays); free(loader->overlays);
rarch_task_overlay_free(task);
} }
else if (task->finished) else if (task->finished)
{ {
@ -683,9 +676,9 @@ task_finished:
data->active = loader->active; data->active = loader->active;
task->task_data = data; task->task_data = data;
rarch_task_overlay_free(task);
} }
rarch_task_overlay_free(task);
} }