diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-02 12:25:03 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-02 12:25:03 +0100 |
commit | 7328cc4a1920285988c9b7bd8f2a0c19149c9aa2 (patch) | |
tree | 5c759ffa2de476e0c8bf152c192b24aaef6bf0d3 /src/drivers | |
parent | e28e8c11bba0779386fc16ee47deac4db39b51c0 (diff) | |
parent | b4da5afcce1b1b4806d4583ee04ad126bbba8e01 (diff) | |
download | px4-firmware-7328cc4a1920285988c9b7bd8f2a0c19149c9aa2.tar.gz px4-firmware-7328cc4a1920285988c9b7bd8f2a0c19149c9aa2.tar.bz2 px4-firmware-7328cc4a1920285988c9b7bd8f2a0c19149c9aa2.zip |
Merge remote-tracking branch 'upstream/master' into dev_ros
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/rgbled/rgbled.cpp | 14 |
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>"); |