#63. Celerity::Assembly: Fix bug where id replacement state wasn't cl…

…eared sometimes.
KonstantinTomashevich · Mar 20, 2023 · bbe58cd · bbe58cd
1 parent 48c562f
commit bbe58cd
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/Library/Public/Celerity/Extension/Assembly/Celerity/Assembly/Assembly.cpp b/Library/Public/Celerity/Extension/Assembly/Celerity/Assembly/Assembly.cpp
@@ -353,6 +353,14 @@ AssemblyExecutionResult Assembler::AssembleObject (PrototypeAssemblyComponent *_
         }
     };
 
+    auto clearIntermediateIdReplacement = [this] ()
+    {
+        for (auto &keyState : keyStates)
+        {
+            keyState.idReplacement.clear ();
+        }
+    };
+
     const bool immediate = (isFixed ? _assembly->fixedAssemblyState : _assembly->normalAssemblyState) ==
                            AssemblyState::IN_NEED_OF_IMMEDIATE_ASSEMBLY;
     GetObjectIdKeyState ().idReplacement.emplace (ASSEMBLY_ROOT_OBJECT_ID, _assembly->objectId);
@@ -400,6 +408,7 @@ AssemblyExecutionResult Assembler::AssembleObject (PrototypeAssemblyComponent *_
     if (index < descriptor->components.size ())
     {
         saveIntermediateIdReplacement ();
+        clearIntermediateIdReplacement ();
         return AssemblyExecutionResult::OUT_OF_TIME;
     }
 
@@ -416,11 +425,8 @@ AssemblyExecutionResult Assembler::AssembleObject (PrototypeAssemblyComponent *_
     }
 
     (isFixed ? _assembly->fixedAssemblyState : _assembly->normalAssemblyState) = AssemblyState::ASSEMBLED;
-    for (auto &keyState : keyStates)
-    {
-        keyState.idReplacement.clear ();
-    }
-
+    clearIntermediateIdReplacement ();
+
     auto eventCursor = insertFinishedEvent.Execute ();
     void *event = ++eventCursor;
     *static_cast<UniqueId *> (event) = _assembly->objectId;