Merge pull request #152 from Scrabx3/dev

Fix argument forwarding in Event classes
powerof3 · Nov 25, 2024 · 3e29894 · 3e29894
2 parents 1372f92 + 9b932e0
commit 3e29894
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/include/SKSE/RegistrationMap.h b/include/SKSE/RegistrationMap.h
@@ -100,8 +100,12 @@ namespace SKSE
 					if (auto vm = RE::BSScript::Internal::VirtualMachine::GetSingleton()) {
 						if (auto it = this->_regs.find(a_filter); it != this->_regs.end()) {
 							for (auto& handle : it->second) {
-								auto args = RE::MakeFunctionArguments(std::forward<Args>(a_args)...);
-								vm->SendEvent(handle, eventName, args);
+								auto copy = std::make_tuple(a_args...);
+								std::apply([&](auto&&... a_copy) {
+									auto args = RE::MakeFunctionArguments(std::forward<Args>(a_copy)...);
+									vm->SendEvent(handle, eventName, args);
+								},
+									copy);
 							}
 						}
 					}

diff --git a/include/SKSE/RegistrationMapUnique.h b/include/SKSE/RegistrationMapUnique.h
@@ -108,8 +108,12 @@ namespace SKSE
 							for (auto& [eventFilter, handles] : it->second) {
 								if (a_callback(eventFilter.first, eventFilter.second)) {
 									for (auto& handle : handles) {
-										auto args = RE::MakeFunctionArguments(std::forward<Args>(a_args)...);
-										vm->SendEvent(handle, eventName, args);
+										auto copy = std::make_tuple(a_args...);
+										std::apply([&](auto&&... a_copy) {
+											auto args = RE::MakeFunctionArguments(std::forward<Args>(a_copy)...);
+											vm->SendEvent(handle, eventName, args);
+										},
+											copy);
 									}
 								}
 							}

diff --git a/include/SKSE/RegistrationSet.h b/include/SKSE/RegistrationSet.h
@@ -87,8 +87,12 @@ namespace SKSE
 
 				auto vm = RE::BSScript::Internal::VirtualMachine::GetSingleton();
 				for (auto& handle : _handles) {
-					auto args = RE::MakeFunctionArguments(std::forward<Args>(a_args)...);
-					vm->SendEvent(handle, eventName, args);
+					auto copy = std::make_tuple(a_args...);
+					std::apply([&](auto&&... a_copy) {
+						auto args = RE::MakeFunctionArguments(std::forward<Args>(a_copy)...);
+						vm->SendEvent(handle, eventName, args);
+					},
+						copy);
 				}
 			}
 

diff --git a/include/SKSE/RegistrationSetUnique.h b/include/SKSE/RegistrationSetUnique.h
@@ -92,8 +92,12 @@ namespace SKSE
 					const auto targetID = a_target->GetFormID();
 					if (const auto it = _regs.find(targetID); it != _regs.end()) {
 						for (auto& handle : it->second) {
-							auto args = RE::MakeFunctionArguments(std::forward<Args>(a_args)...);
-							vm->SendEvent(handle, eventName, args);
+							auto copy = std::make_tuple(a_args...);
+							std::apply([&](auto&&... a_copy) {
+								auto args = RE::MakeFunctionArguments(std::forward<Args>(a_copy)...);
+								vm->SendEvent(handle, eventName, args);
+							},
+								copy);
 						}
 					}
 				}