From 0f42249dd519ac0b97a3630f260812effe88f69a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 24 May 2016 02:55:27 +0200 Subject: [PATCH] Cleanups --- tasks/task_overlay.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index e44aac6570..347246cf7d 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -643,23 +643,15 @@ static void rarch_task_overlay_handler(retro_task_t *task) break; case OVERLAY_STATUS_DEFERRED_ERROR: task->error = strdup("Failed to load the overlay."); + task->cancelled = true; + break; case OVERLAY_STATUS_DEFERRED_DONE: default: case OVERLAY_STATUS_NONE: task->finished = true; - goto task_finished; + break; } - if (task->cancelled) - { - task->finished = true; - goto task_finished; - } - - return; - -task_finished: - if (task->cancelled) { unsigned i; @@ -673,6 +665,7 @@ task_finished: input_overlay_free_overlay(&loader->overlays[i]); free(loader->overlays); + rarch_task_overlay_free(task); } else if (task->finished) { @@ -683,9 +676,9 @@ task_finished: data->active = loader->active; task->task_data = data; + rarch_task_overlay_free(task); } - rarch_task_overlay_free(task); }