From 6db1dbbe02ddf5e86296ade019548dba7f459718 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 13 Jan 2025 23:49:09 +1000 Subject: [PATCH] GameList: Don't return nonexistant path on icon extract fail --- src/core/game_list.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/game_list.cpp b/src/core/game_list.cpp index aa0ccf9a0..ea2907613 100644 --- a/src/core/game_list.cpp +++ b/src/core/game_list.cpp @@ -1835,11 +1835,13 @@ std::string GameList::GetGameIconPath(std::string_view serial, std::string_view std::memcpy(image.GetPixels(), &fi.icon_frames.front().pixels, MemoryCardImage::ICON_WIDTH * MemoryCardImage::ICON_HEIGHT * sizeof(u32)); serial_entry->icon_was_extracted = image.SaveToFile(ret.c_str()); - if (!serial_entry->icon_was_extracted) + if (serial_entry->icon_was_extracted) + { + return ret; + } + else { ERROR_LOG("Failed to save memory card icon to {}.", ret); - ret = {}; - return ret; } } } @@ -1849,6 +1851,7 @@ std::string GameList::GetGameIconPath(std::string_view serial, std::string_view ERROR_LOG("Failed to load memory card '{}': {}", Path::GetFileName(memcard_path), error.GetDescription()); } + ret = {}; UpdateMemcardTimestampCache(*serial_entry); return ret; }