From eab4f35611d692430fdb1722612959112649609a Mon Sep 17 00:00:00 2001
From: William Woodall <william@osrfoundation.org>
Date: Sun, 9 Mar 2014 16:19:03 -0400
Subject: [PATCH] fix handling of nodelet manager events

---
 src/capabilities/server.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/capabilities/server.py b/src/capabilities/server.py
index 39ce0be..591da34 100644
--- 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: