ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9267 from leoetlino/fix-lambda-captures 

Core: Fix invalid lambda captures
This commit is contained in:
JosJuice 2020-11-20 18:32:47 +01:00 committed by GitHub
parent f45a4a5916 542c49bab0
commit 17da28ff07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
View File

@ -185,7 +185,11 @@ void CEXIMemoryCard::SetupGciFolder(const Memcard::HeaderData& header_data)
CurrentGameId = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str())); 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); const File::FileInfo file_info(strDirectoryName);
if (!file_info.Exists()) if (!file_info.Exists())