From ec6599d7cd23ee60b241eb845623d295eb693e47 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 22 Apr 2026 19:58:38 +1000 Subject: [PATCH] MemoryCard: Fix open error not propagating --- src/core/memory_card_image.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/memory_card_image.cpp b/src/core/memory_card_image.cpp index a11d2513e..8c206954c 100644 --- a/src/core/memory_card_image.cpp +++ b/src/core/memory_card_image.cpp @@ -106,15 +106,16 @@ bool MemoryCardImage::LoadFromFile(DataArray* data, const char* filename, Error* const s64 size = FileSystem::FSize64(fp.get()); if (size != static_cast(DATA_SIZE)) { - ERROR_LOG("Memory card {} is incorrect size (expected {} got {})", Path::GetFileName(filename), - static_cast(DATA_SIZE), size); + Error::SetStringFmt(error, "Memory card {} is incorrect size (expected {} got {})", Path::GetFileName(filename), + static_cast(DATA_SIZE), size); return false; } const size_t num_read = std::fread(data->data(), 1, DATA_SIZE, fp.get()); if (num_read != DATA_SIZE) { - ERROR_LOG("Only read {} of {} sectors from '{}'", num_read / FRAME_SIZE, static_cast(NUM_FRAMES), filename); + Error::SetStringFmt(error, "Only read {} of {} sectors from '{}'", num_read / FRAME_SIZE, + static_cast(NUM_FRAMES), filename); return false; }