Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[AssetHandler] Use mutex to synchronize DB_FXAH access

Browse Source
This commit is contained in:
momo5502 2016-12-19 19:41:29 +01:00
parent d8d67898f3
commit bac3f4cd44
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Components/Modules/AssetHandler.cpp
View File

@ -3,6 +3,7 @@
namespace Components namespace Components
{ {
bool AssetHandler::BypassState = false; bool AssetHandler::BypassState = false;
std::recursive_mutex AssetHandler::BypassMutex;
std::map<Game::XAssetType, AssetHandler::IAsset*> AssetHandler::AssetInterfaces; std::map<Game::XAssetType, AssetHandler::IAsset*> AssetHandler::AssetInterfaces;
std::map<Game::XAssetType, wink::slot<AssetHandler::Callback>> AssetHandler::TypeCallbacks; std::map<Game::XAssetType, wink::slot<AssetHandler::Callback>> AssetHandler::TypeCallbacks;
wink::signal<wink::slot<AssetHandler::RestrictCallback>> AssetHandler::RestrictSignal; wink::signal<wink::slot<AssetHandler::RestrictCallback>> AssetHandler::RestrictSignal;
@ -54,6 +55,8 @@ namespace Components
if (filename) if (filename)
{ {
std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex);
// Allow call DB_FindXAssetHeader within the hook // Allow call DB_FindXAssetHeader within the hook
AssetHandler::BypassState = true; AssetHandler::BypassState = true;
@ -308,11 +311,13 @@ namespace Components
Game::XAssetHeader AssetHandler::FindOriginalAsset(Game::XAssetType type, const char* filename) Game::XAssetHeader AssetHandler::FindOriginalAsset(Game::XAssetType type, const char* filename)
{ {
bool OriginalState = AssetHandler::BypassState; std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex);
bool originalState = AssetHandler::BypassState;
AssetHandler::BypassState = true; AssetHandler::BypassState = true;
Game::XAssetHeader header = Game::DB_FindXAssetHeader(type, filename); Game::XAssetHeader header = Game::DB_FindXAssetHeader(type, filename);
if(!OriginalState) AssetHandler::BypassState = false; if(!originalState) AssetHandler::BypassState = false;
return header; return header;
} }

1
src/Components/Modules/AssetHandler.hpp
View File

@ -41,6 +41,7 @@ namespace Components
private: private:
static bool BypassState; static bool BypassState;
static std::recursive_mutex BypassMutex;
static std::map<std::string, Game::XAssetHeader> TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT]; static std::map<std::string, Game::XAssetHeader> TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT];