diff options
| author | JosJuice <josjuice@gmail.com> | 2020-11-20 18:32:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 18:32:47 +0100 |
| commit | 17da28ff07d1a98aaaac0fe212804a5e90125b27 (patch) | |
| tree | 6c128721f2a0cecf2dab026c00444861259f5665 /Source | |
| parent | f45a4a59168b571a573cce66169eae3b51dc4357 (diff) | |
| parent | 542c49bab0eb2c40adbc70e85bd93762899c0755 (diff) | |
Merge pull request #9267 from leoetlino/fix-lambda-captures
Core: Fix invalid lambda captures
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp index 2ab706e671..92eb5e40f6 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp @@ -185,7 +185,11 @@ void CEXIMemoryCard::SetupGciFolder(const Memcard::HeaderData& header_data) CurrentGameId = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str())); } - const auto [strDirectoryName, migrate] = GetGCIFolderPath(card_index, AllowMovieFolder::Yes); + // TODO(C++20): Use structured bindings when we can use C++20 and refer to structured bindings + // in lambda captures + const auto folder_path = GetGCIFolderPath(card_index, AllowMovieFolder::Yes); + const auto& strDirectoryName = folder_path.first; + const bool migrate = folder_path.second; const File::FileInfo file_info(strDirectoryName); if (!file_info.Exists()) |