fix: copy args before invoking callbacks

opentibiabr · Sep 13, 2023 · 923d196 · 923d196
1 parent 12d618f
commit 923d196
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/lua/callbacks/events_callbacks.hpp b/src/lua/callbacks/events_callbacks.hpp
@@ -78,8 +78,14 @@ class EventsCallbacks {
 	template <typename CallbackFunc, typename... Args>
 	void executeCallback(EventCallback_t eventType, CallbackFunc callbackFunc, Args &&... args) {
 		for (const auto &callback : getCallbacksByType(eventType)) {
+			auto argsCopy = std::make_tuple(args...);
 			if (callback && callback->isLoadedCallback()) {
-				((*callback).*callbackFunc)(std::forward<Args>(args)...);
+				std::apply(
+					[&callback, &callbackFunc](auto &&... args) {
+						((*callback).*callbackFunc)(std::forward<decltype(args)>(args)...);
+					},
+					argsCopy
+				);
 			}
 		}
 	}
@@ -96,8 +102,14 @@ class EventsCallbacks {
 		bool allCallbacksSucceeded = true;
 
 		for (const auto &callback : getCallbacksByType(eventType)) {
-			if (callback && callback->isLoadedCallback()) { // Verifique se o callback é não nulo
-				bool callbackResult = ((*callback).*callbackFunc)(std::forward<Args>(args)...);
+			auto argsCopy = std::make_tuple(args...);
+			if (callback && callback->isLoadedCallback()) {
+				bool callbackResult = std::apply(
+					[&callback, &callbackFunc](auto &&... args) {
+						return ((*callback).*callbackFunc)(std::forward<decltype(args)>(args)...);
+					},
+					argsCopy
+				);
 				allCallbacksSucceeded = allCallbacksSucceeded && callbackResult;
 			}
 		}