From d301b965db6c05b893d27faf96e721cef782e278 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Mon, 10 Feb 2025 03:11:21 +0200 Subject: [PATCH] Revert SharedExtSaveData format change --- src/core/fs/archive_ext_save_data.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/fs/archive_ext_save_data.cpp b/src/core/fs/archive_ext_save_data.cpp index 212c2c30..2f4ad227 100644 --- a/src/core/fs/archive_ext_save_data.cpp +++ b/src/core/fs/archive_ext_save_data.cpp @@ -286,13 +286,6 @@ Rust::Result ExtSaveDataArchive::openArchive(const Helpers::panic("ExtSaveData accessed with an invalid path in OpenArchive"); } - // Create a format info path in the style of AppData/FormatInfo/Cartridge10390390194.format - const fs::path formatInfoPath = getFormatInfoPath(path); - // Format info not found so the archive is not formatted - if (!fs::is_regular_file(formatInfoPath)) { - return isNAND ? Err(Result::FS::NotFormatted) : Err(Result::FS::NotFoundInvalid); - } - // TODO: Do shared archives need to be formatted? if (isShared) { const fs::path saveDataPath = IOFile::getAppData() / getExtSaveDataPath(); @@ -303,6 +296,13 @@ Rust::Result ExtSaveDataArchive::openArchive(const return Ok((ArchiveBase*)this); } + // Create a format info path in the style of AppData/FormatInfo/Cartridge10390390194.format + const fs::path formatInfoPath = getFormatInfoPath(path); + // Format info not found so the archive is not formatted + if (!fs::is_regular_file(formatInfoPath)) { + return isNAND ? Err(Result::FS::NotFormatted) : Err(Result::FS::NotFoundInvalid); + } + return Ok((ArchiveBase*)this); }