fix handling of nodelet manager events

osrf · Mar 9, 2014 · eab4f35 · eab4f35
1 parent af21fda
commit eab4f35
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/capabilities/server.py b/src/capabilities/server.py
@@ -476,12 +476,11 @@ def _handle_capability_events(self, event):
             return
         # Specially handle the nodelet manager
         if event.capability == _special_nodelet_manager_capability:
-            if event.type == event.LAUNCHED:
-                return
-            elif event.type == event.TERMINATED:
+            if event.type == event.TERMINATED:
                 if not rospy.is_shutdown():
                     rospy.logerr("Capability server's nodelet manager terminated unexpectedly.")
                     self.shutdown()
+            return
         # Update the capability
         capability = event.capability
         with self.__graph_lock: