Merge remote-tracking branch 'upstream/master' into dev_ros

1 files changed, 7 insertions, 7 deletions

diff --git a/src/drivers/rgbled/rgbled.cpp b/src/drivers/rgbled/rgbled.cpp
index 13cbfdfa8..d35722244 100644
--- a/src/drivers/rgbled/rgbled.cpp
+++ b/src/drivers/rgbled/rgbled.cpp
@@ -121,7 +121,7 @@ private:
 /* for now, we only support one RGBLED */
 namespace
 {
-RGBLED *g_rgbled;
+RGBLED *g_rgbled = nullptr;
 }
 
 void rgbled_usage();
@@ -680,15 +680,15 @@ rgbled_main(int argc, char *argv[])
 
 		ret = ioctl(fd, RGBLED_SET_MODE, (unsigned long)RGBLED_MODE_OFF);
 		close(fd);
+		/* delete the rgbled object if stop was requested, in addition to turning off the LED. */
+		if (!strcmp(verb, "stop")) {
+			delete g_rgbled;
+			g_rgbled = nullptr;
+			exit(0);
+		}
 		exit(ret);
 	}
 
-	if (!strcmp(verb, "stop")) {
-		delete g_rgbled;
-		g_rgbled = nullptr;
-		exit(0);
-	}
-
 	if (!strcmp(verb, "rgb")) {
 		if (argc < 5) {
 			errx(1, "Usage: rgbled rgb <red> <green> <blue>");