fix: deadlock issue with AddItem

tiltedphoques · Dec 23, 2021 · c5412d2 · c5412d2
1 parent f96ae17
commit c5412d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Code/client/Games/ExtraData.cpp b/Code/client/Games/ExtraData.cpp
@@ -42,15 +42,13 @@ bool BSExtraDataList::Add(ExtraData aType, BSExtraData* apNewData)
     if (Contains(aType))
         return false;
 
-    lock.Lock();
+    BSScopedLock<BSRecursiveLock> _(lock);
 
     BSExtraData* pNext = data;
     data = apNewData;
     apNewData->next = pNext;
     SetType(aType, false);
 
-    lock.Unlock();
-
     return true;
 }
 

diff --git a/Code/client/Services/Generic/TestService.cpp b/Code/client/Services/Generic/TestService.cpp
@@ -57,6 +57,7 @@
 #include <ExtraData/ExtraWornLeft.h>
 #include <Forms/EnchantmentItem.h>
 #include <Forms/AlchemyItem.h>
+#include <Structs/Container.h>
 #endif
 
 #include <imgui.h>
@@ -185,9 +186,14 @@ void TestService::OnUpdate(const UpdateEvent& acUpdateEvent) noexcept
             auto fullContainer = PlayerCharacter::Get()->GetFullContainer();
             spdlog::info("Full container entries: {}", fullContainer.Entries.size());
 
-            auto pActor = m_actors[0];
-            auto* pObj = RTTI_CAST(TESForm::GetById(0x139B9), TESForm, TESBoundObject);
-            pActor->AddObjectToContainer(pObj, nullptr, 1, nullptr);
+            for (auto entry : fullContainer.Entries)
+            {
+                if (entry.BaseId.BaseId == 0x139b9)
+                {
+                    m_actors[0]->AddItem(entry);
+                    break;
+                }
+            }
 
             /*
             auto* pActor = (Actor*)TESForm::GetById(0xFF000DA5);