From 954cd227ce4efed87661f1368ec3c458b8c14d77 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Mon, 13 Feb 2017 22:24:31 +0100
Subject: [PATCH] [AssetHandler] Count bypass states

---
 src/Components/Modules/AssetHandler.cpp | 19 +++++++++++--------
 src/Components/Modules/AssetHandler.hpp |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Components/Modules/AssetHandler.cpp b/src/Components/Modules/AssetHandler.cpp
index f927c81e..dfd3b6dd 100644
--- a/src/Components/Modules/AssetHandler.cpp
+++ b/src/Components/Modules/AssetHandler.cpp
@@ -2,7 +2,7 @@
 
 namespace Components
 {
-	thread_local bool AssetHandler::BypassState;
+	thread_local int AssetHandler::BypassState = 0;
 	std::map<Game::XAssetType, AssetHandler::IAsset*> AssetHandler::AssetInterfaces;
 	std::map<Game::XAssetType, Utils::Slot<AssetHandler::Callback>> AssetHandler::TypeCallbacks;
 	Utils::Signal<AssetHandler::RestrictCallback> AssetHandler::RestrictSignal;
@@ -55,7 +55,7 @@ namespace Components
 		if (filename)
 		{
 			// Allow call DB_FindXAssetHeader within the hook
-			AssetHandler::BypassState = true;
+			++AssetHandler::BypassState;
 
 			if (AssetHandler::TypeCallbacks.find(type) != AssetHandler::TypeCallbacks.end())
 			{
@@ -63,7 +63,7 @@ namespace Components
 			}
 
 			// Disallow calling DB_FindXAssetHeader ;)
-			AssetHandler::BypassState = false;
+			--AssetHandler::BypassState;
 		}
 
 		return header;
@@ -71,7 +71,7 @@ namespace Components
 
 	int AssetHandler::HasThreadBypass()
 	{
-		return AssetHandler::BypassState & 1;
+		return AssetHandler::BypassState > 0;
 	}
 
 	__declspec(naked) void AssetHandler::FindAssetStub()
@@ -337,11 +337,14 @@ namespace Components
 
 	Game::XAssetHeader AssetHandler::FindOriginalAsset(Game::XAssetType type, const char* filename)
 	{
-		int originalState = AssetHandler::HasThreadBypass();
-
-		AssetHandler::BypassState = true;
+		++AssetHandler::BypassState;
 		Game::XAssetHeader header = Game::DB_FindXAssetHeader(type, filename);
-		if (!originalState) AssetHandler::BypassState = false;
+		--AssetHandler::BypassState;
+
+		if(AssetHandler::BypassState < 0)
+		{
+			Logger::Error("DB_FindXAssetHeader bypass state reached level below 0, what the fuck????");
+		}
 
 		return header;
 	}
diff --git a/src/Components/Modules/AssetHandler.hpp b/src/Components/Modules/AssetHandler.hpp
index 501b8eaa..ccc396c7 100644
--- a/src/Components/Modules/AssetHandler.hpp
+++ b/src/Components/Modules/AssetHandler.hpp
@@ -42,7 +42,7 @@ namespace Components
 		static void StoreTemporaryAsset(Game::XAssetType type, Game::XAssetHeader asset);
 
 	private:
-		static thread_local bool BypassState;
+		static thread_local int BypassState;
 
 		static std::map<std::string, Game::XAssetHeader> TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT];