Fix issue with importing monitor module into empty world

SanderMertens · May 11, 2023 · c8f946b · c8f946b
1 parent 549ee55
commit c8f946b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/flecs.c b/flecs.c
@@ -18482,6 +18482,8 @@ void FlecsMonitorImport(
  ecs_world_t *world)
 {
  ECS_MODULE_DEFINE(world, FlecsMonitor);
+ ECS_IMPORT(world, FlecsPipeline);
+ ECS_IMPORT(world, FlecsTimer);
 
  ecs_set_name_prefix(world, "Ecs");
 

diff --git a/src/addons/monitor.c b/src/addons/monitor.c
@@ -291,6 +291,8 @@ void FlecsMonitorImport(
  ecs_world_t *world)
 {
  ECS_MODULE_DEFINE(world, FlecsMonitor);
+ ECS_IMPORT(world, FlecsPipeline);
+ ECS_IMPORT(world, FlecsTimer);
 
  ecs_set_name_prefix(world, "Ecs");
 

diff --git a/test/addons/project.json b/test/addons/project.json
@@ -1376,6 +1376,7 @@
  "module_tag_on_namespace_on_add",
  "module_tag_on_namespace_on_add_2_levels",
  "import_monitor_2_worlds",
+ "import_monitor_after_mini",
  "import_2_worlds"
  ]
  }, {

diff --git a/test/addons/src/Modules.c b/test/addons/src/Modules.c
@@ -400,3 +400,13 @@ void Modules_import_monitor_2_worlds() {
  ecs_fini(world_1);
  ecs_fini(world_2);
 }
+
+void Modules_import_monitor_after_mini() {
+ ecs_world_t *world = ecs_mini();
+
+ ECS_IMPORT(world, FlecsMonitor);
+
+ test_assert(ecs_exists(world, ecs_id(FlecsMonitor)));
+
+ ecs_fini(world);
+}
diff --git a/test/addons/src/main.c b/test/addons/src/main.c
@@ -1319,6 +1319,7 @@ void Modules_module_tag_on_namespace(void);
 void Modules_module_tag_on_namespace_on_add(void);
 void Modules_module_tag_on_namespace_on_add_2_levels(void);
 void Modules_import_monitor_2_worlds(void);
+void Modules_import_monitor_after_mini(void);
 void Modules_import_2_worlds(void);
 
 // Testsuite 'App'
@@ -6451,6 +6452,10 @@ bake_test_case Modules_testcases[] = {
  "import_monitor_2_worlds",
  Modules_import_monitor_2_worlds
  },
+ {
+ "import_monitor_after_mini",
+ Modules_import_monitor_after_mini
+ },
  {
  "import_2_worlds",
  Modules_import_2_worlds
@@ -6796,7 +6801,7 @@ static bake_test_suite suites[] = {
  "Modules",
  Modules_setup,
  NULL,
- 22,
+ 23,
  Modules_testcases
  },
  {