fix(Executor): Don't add the notify_waitable two times to the waitset

Signed-off-by: Janosch Machowinski <[email protected]>
ros2 · Jan 17, 2025 · 7e29c68 · 7e29c68
1 parent 2d1b770
commit 7e29c68
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp
@@ -84,7 +84,9 @@ Executor::Executor(const rclcpp::ExecutorOptions & options)
   notify_waitable_->add_guard_condition(interrupt_guard_condition_);
   notify_waitable_->add_guard_condition(shutdown_guard_condition_);
 
-  wait_set_.add_waitable(notify_waitable_);
+  // we need to initially rebuild the collection,
+  // so that the notify_waitable_ is added
+  collect_entities();
 }
 
 Executor::~Executor()