The-Homebrew-Cloud/homebrew_on_menu_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/homebrew_on_menu_plugin.git synced 2024-11-22 02:29:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change the scope of the mutex when hooking into the FSReadfile to avoid a possible deadlook when exiting some games.

Browse Source
This commit is contained in:
Maschell 2022-09-10 14:18:39 +02:00
parent 6d868eabb9
commit b10a288150
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.cpp
View File

@ -451,12 +451,14 @@ DECL_FUNCTION(int32_t, MCP_TitleList, uint32_t handle, uint32_t *outTitleCount,
uint32_t titleCount = *outTitleCount; uint32_t titleCount = *outTitleCount;
std::lock_guard<std::mutex> lock(fileInfosMutex); {
readCustomTitlesFromSD(); std::lock_guard<std::mutex> lock(fileInfosMutex);
readCustomTitlesFromSD();
for (auto &gFileInfo : fileInfos) { for (auto &gFileInfo : fileInfos) {
memcpy(&(titleList[titleCount]), &(gFileInfo->titleInfo), sizeof(MCPTitleListType)); memcpy(&(titleList[titleCount]), &(gFileInfo->titleInfo), sizeof(MCPTitleListType));
titleCount++; titleCount++;
}
} }
*outTitleCount = titleCount; *outTitleCount = titleCount;
@ -540,10 +542,12 @@ DECL_FUNCTION(FSStatus, FSCloseFile, FSClient *client, FSCmdBlock *block, FSFile
} }
DECL_FUNCTION(FSStatus, FSReadFile, FSClient *client, FSCmdBlock *block, uint8_t *buffer, uint32_t size, uint32_t count, FSFileHandle handle, uint32_t unk1, uint32_t flags) { DECL_FUNCTION(FSStatus, FSReadFile, FSClient *client, FSCmdBlock *block, uint8_t *buffer, uint32_t size, uint32_t count, FSFileHandle handle, uint32_t unk1, uint32_t flags) {
const std::lock_guard<std::mutex> lock(fileReaderListMutex); {
for (auto &reader : openFileReaders) { const std::lock_guard<std::mutex> lock(fileReaderListMutex);
if ((uint32_t) reader.get() == (uint32_t) handle) { for (auto &reader : openFileReaders) {
return (FSStatus) (reader->read(buffer, size * count) / size); if ((uint32_t) reader.get() == (uint32_t) handle) {
return (FSStatus) (reader->read(buffer, size * count) / size);
}
} }
} }
FSStatus result = real_FSReadFile(client, block, buffer, size, count, handle, unk1, flags); FSStatus result = real_FSReadFile(client, block, buffer, size, count, handle, unk1, flags);