Fix CallScope operator() causing infinite loop when called by hook

satisfactorymodding · Mar 12, 2020 · d287e7f · d287e7f
1 parent 18dda8e
commit d287e7f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Source/SML/mod/hooking.h b/Source/SML/mod/hooking.h
@@ -52,15 +52,17 @@ struct CallScope<void(*)(Args...)> {
 	}
 
 	void Cancel() {
-		this->forwardCall = false;
+		forwardCall = false;
 	}
 
 	inline void operator()(Args... args) {
 		if (functionList == nullptr || handlerPtr >= functionList->size()) {
 			function(args...);
+			forwardCall = false;
 		} else {
 			auto cachePtr = handlerPtr + 1;
-			functionList->at(handlerPtr++)(*this, args...);
+			auto& handler = functionList->at(handlerPtr++);
+			handler(*this, args...);
 			if (handlerPtr == cachePtr && forwardCall) {
 				(*this)(args...);
 			}
@@ -102,9 +104,11 @@ struct CallScope<Result(*)(Args...)> {
 	inline void operator()(Args... args) {
 		if (functionList == nullptr || handlerPtr >= functionList->size()) {
 			result = function(args...);
+			this->forwardCall = false;
 		} else {
 			auto cachePtr = handlerPtr + 1;
-			functionList->at(handlerPtr++)(*this, args...);
+			auto handler = functionList->at(handlerPtr++);
+			handler(*this, args...);
 			if (handlerPtr == cachePtr && forwardCall) {
 				(*this)(args...);
 			}