From 5aebd56fb0b021afad3c09593d3ad9a07e4e9ef4 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebas.a.castro@gmail.com>
Date: Sun, 1 Sep 2024 23:00:50 -0400
Subject: [PATCH] Always shut down rclpy

---
 pyrobosim_ros/pyrobosim_ros/ros_interface.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyrobosim_ros/pyrobosim_ros/ros_interface.py b/pyrobosim_ros/pyrobosim_ros/ros_interface.py
index 1eacd29a..3e4ea942 100644
--- a/pyrobosim_ros/pyrobosim_ros/ros_interface.py
+++ b/pyrobosim_ros/pyrobosim_ros/ros_interface.py
@@ -213,6 +213,7 @@ def shutdown(self):
             self.destroy_node()
             self.executor.shutdown()
             self.executor = None
+        if rclpy.ok():
             rclpy.shutdown()
 
     def add_robot_ros_interfaces(self, robot):