fix for callbacks

ThirteenAG · Oct 11, 2024 · 3ee416a · 3ee416a
1 parent 721d627
commit 3ee416a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/includes/callbacks.h b/includes/callbacks.h
@@ -162,6 +162,7 @@ class CallbackHandler
     {
         std::function<void()> fn;
         std::optional<hook::pattern> pattern;
+        bool executed;
     };
 
     static inline auto& GetOnModuleLoadCallbackList()
@@ -321,15 +322,24 @@ class CallbackHandler
     {
         auto& threadParams = GetCallbackParamsList();
 
+        static std::mutex threadParamsMutex;
+        std::lock_guard<std::mutex> lock(threadParamsMutex);
+
         for (auto& it : threadParams)
         {
-            if (!it.pattern.has_value() || !it.pattern.value().clear().empty())
-                it.fn();
+            if (!it.executed)
+            {
+                if (!it.pattern.has_value() || !it.pattern.value().clear().empty())
+                {
+                    it.executed = true;
+                    it.fn();
+                }
+            }
         }
 
         shGetSystemTimeAsFileTime.stdcall<ReturnType<decltype(GetSystemTimeAsFileTime)>>(lpSystemTimeAsFileTime);
 
-        if (threadParams.empty())
+        if (std::all_of(threadParams.begin(), threadParams.end(), [](const auto& params) { return params.executed; }))
             shGetSystemTimeAsFileTime = {};
     }
 

diff --git a/source/ResidentEvil2.RE3.Dolphin.FusionMod/dllmain.cpp b/source/ResidentEvil2.RE3.Dolphin.FusionMod/dllmain.cpp
@@ -41,7 +41,7 @@ void PluginThread(std::future<void> futureObj)
                 if (Dolphin::MemoryValid())
                 {
                     auto gameVersion = GameVersion::UNDEFINED;
-                    if (Dolphin::GameID() == "GHAE08" || Dolphin::GameID() == "GHAP08")
+                    if (Dolphin::GameID() == "GHAE08" || Dolphin::GameID() == "GHAP08" || Dolphin::GameID() == "GHAJ08")
                         gameVersion = GameVersion::RE2;
                     else if (Dolphin::GameID() == "GLEE08" || Dolphin::GameID() == "GLEJ08" || Dolphin::GameID() == "GLEP08")
                         gameVersion = GameVersion::RE3;