Put all observers before overrides

maximegmd · Oct 2, 2021 · 3895e23 · 3895e23
1 parent 07e51c7
commit 3895e23
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/scripting/FunctionOverride.cpp b/src/scripting/FunctionOverride.cpp
@@ -499,6 +499,16 @@ void FunctionOverride::Override(const std::string& acTypeName, const std::string
         pContext->Environment = aEnvironment;
         pContext->Forward = !aAbsolute;
 
-        pEntry->Calls.emplace_back(std::move(pContext));
+        if (aAbsolute || pEntry->Calls.empty())
+        {
+            pEntry->Calls.emplace_back(std::move(pContext));
+        }
+        else
+        {
+            auto pos = std::find_if(pEntry->Calls.rbegin(), pEntry->Calls.rend(),
+                                    [](TiltedPhoques::UniquePtr<Context>& aContext) { return aContext->Forward; });
+
+            pEntry->Calls.insert(pos.base(), std::move(pContext));
+        }
     }
 }