diff options
| author | Lioncash <mathew1800@gmail.com> | 2021-06-23 15:59:56 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2021-06-23 19:48:21 +0200 |
| commit | d0b1f2bd05a2fcadbb4c148be2105e337dd986e8 (patch) | |
| tree | 17e7abb608ab936ae6696e0507c9d1441256c66a /src/core/file_sys | |
| parent | externals: Update dynarmic to allow fmt compilation to succeed (diff) | |
| download | yuzu-d0b1f2bd05a2fcadbb4c148be2105e337dd986e8.tar yuzu-d0b1f2bd05a2fcadbb4c148be2105e337dd986e8.tar.gz yuzu-d0b1f2bd05a2fcadbb4c148be2105e337dd986e8.tar.bz2 yuzu-d0b1f2bd05a2fcadbb4c148be2105e337dd986e8.tar.lz yuzu-d0b1f2bd05a2fcadbb4c148be2105e337dd986e8.tar.xz yuzu-d0b1f2bd05a2fcadbb4c148be2105e337dd986e8.tar.zst yuzu-d0b1f2bd05a2fcadbb4c148be2105e337dd986e8.zip | |
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/registered_cache.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 066c6789a..7a646b5f1 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -58,14 +58,17 @@ static bool FollowsNcaIdFormat(std::string_view name) { static std::string GetRelativePathFromNcaID(const std::array<u8, 16>& nca_id, bool second_hex_upper, bool within_two_digit, bool cnmt_suffix) { - if (!within_two_digit) - return fmt::format(cnmt_suffix ? "{}.cnmt.nca" : "/{}.nca", - Common::HexToString(nca_id, second_hex_upper)); + if (!within_two_digit) { + const auto format_str = fmt::runtime(cnmt_suffix ? "{}.cnmt.nca" : "/{}.nca"); + return fmt::format(format_str, Common::HexToString(nca_id, second_hex_upper)); + } Core::Crypto::SHA256Hash hash{}; mbedtls_sha256_ret(nca_id.data(), nca_id.size(), hash.data(), 0); - return fmt::format(cnmt_suffix ? "/000000{:02X}/{}.cnmt.nca" : "/000000{:02X}/{}.nca", hash[0], - Common::HexToString(nca_id, second_hex_upper)); + + const auto format_str = + fmt::runtime(cnmt_suffix ? "/000000{:02X}/{}.cnmt.nca" : "/000000{:02X}/{}.nca"); + return fmt::format(format_str, hash[0], Common::HexToString(nca_id, second_hex_upper)); } static std::string GetCNMTName(TitleType type, u64 title_id) { |