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

Refactor #2

Browse Source
This commit is contained in:
twinaphex 2015-02-23 07:34:14 +01:00
parent 784be49f2f
commit 29b250885c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/input_overlay.c
View File

@ -339,15 +339,15 @@ static bool input_overlay_load_overlay_image(input_overlay_t *ol,
fill_pathname_resolve_relative(overlay_resolved_path, config_path, fill_pathname_resolve_relative(overlay_resolved_path, config_path,
overlay_path, sizeof(overlay_resolved_path)); overlay_path, sizeof(overlay_resolved_path));
if (texture_image_load(&img, overlay_resolved_path)) if (!texture_image_load(&img, overlay_resolved_path))
overlay->image = img;
else
{ {
RARCH_ERR("[Overlay]: Failed to load image: %s.\n", RARCH_ERR("[Overlay]: Failed to load image: %s.\n",
overlay_resolved_path); overlay_resolved_path);
ol->loading_status = OVERLAY_IMAGE_TRANSFER_ERROR; ol->loading_status = OVERLAY_IMAGE_TRANSFER_ERROR;
return false; return false;
} }
overlay->image = img;
} }
return true; return true;
@ -581,9 +581,6 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
switch (ol->loading_status) switch (ol->loading_status)
{ {
case OVERLAY_IMAGE_TRANSFER_NONE: case OVERLAY_IMAGE_TRANSFER_NONE:
ol->loading_status = OVERLAY_IMAGE_TRANSFER_BUSY;
break;
case OVERLAY_IMAGE_TRANSFER_BUSY:
if (!input_overlay_load_overlay_image(ol, ol->conf, if (!input_overlay_load_overlay_image(ol, ol->conf,
ol->overlay_path, &ol->overlays[ol->pos], ol->pos)) ol->overlay_path, &ol->overlays[ol->pos], ol->pos))
{ {
@ -591,6 +588,9 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
goto error; goto error;
} }
ol->loading_status = OVERLAY_IMAGE_TRANSFER_BUSY;
break;
case OVERLAY_IMAGE_TRANSFER_BUSY:
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE; ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE;
break; break;
case OVERLAY_IMAGE_TRANSFER_DONE: case OVERLAY_IMAGE_TRANSFER_DONE: