From 3a981e081c28f4a20597ae003b27d3bb5ea95d88 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 23 Jan 2018 21:46:46 +0100 Subject: [PATCH] Cleanups --- cheevos/badges.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cheevos/badges.c b/cheevos/badges.c index 56a4deb267..4292204ae9 100644 --- a/cheevos/badges.c +++ b/cheevos/badges.c @@ -24,11 +24,9 @@ void set_badge_menu_texture(badges_ctx_t * badges, int i) { char badge_file[16]; char fullpath[PATH_MAX_LENGTH]; - const char * locked_suffix = (badges->badge_locked[i] == true) - ? "_lock.png" : ".png"; - snprintf(badge_file, sizeof(badge_file), "%s", badges->badge_id_list[i]); - strcat(badge_file, locked_suffix); + snprintf(badge_file, sizeof(badge_file), "%s%s", badges->badge_id_list[i], + badges->badge_locked[i] ? "_lock.png" : ".png"); fill_pathname_application_special(fullpath, PATH_MAX_LENGTH * sizeof(char), @@ -54,7 +52,7 @@ void set_badge_info (badges_ctx_t *badge_struct, int id, menu_texture_item get_badge_texture(int id) { settings_t *settings = config_get_ptr(); - if (!settings->bools.cheevos_badges_enable) + if (!settings || !settings->bools.cheevos_badges_enable) return (menu_texture_item)NULL; return badges_ctx.menu_texture_list[id];