From ca19efc53baf15c2c5585fd965612aea80319509 Mon Sep 17 00:00:00 2001
From: Shota Minami <shouth373@gmail.com>
Date: Wed, 14 Feb 2024 08:52:37 +0000
Subject: [PATCH] Update assign `this` after parsing ScenarioObject

---
 openscenario/openscenario_interpreter/src/syntax/entities.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openscenario/openscenario_interpreter/src/syntax/entities.cpp b/openscenario/openscenario_interpreter/src/syntax/entities.cpp
index 6ad20b636cf..05c551205c6 100644
--- a/openscenario/openscenario_interpreter/src/syntax/entities.cpp
+++ b/openscenario/openscenario_interpreter/src/syntax/entities.cpp
@@ -24,12 +24,12 @@ inline namespace syntax
 {
 Entities::Entities(const pugi::xml_node & node, Scope & scope)
 {
-  scope.global().entities = this;
-
   traverse<0, unbounded>(node, "ScenarioObject", [&](auto && node) {
     emplace(readAttribute<String>("name", node, scope), make<ScenarioObject>(node, scope));
   });
 
+  scope.global().entities = this;
+
   traverse<0, unbounded>(node, "EntitySelection", [&](auto && node) {
     emplace(readAttribute<String>("name", node, scope), make<EntitySelection>(node, scope));
   });