diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-28 14:10:53 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-28 14:10:53 +0200 |
| commit | 30405331bdd8f3b6b49801bf68a605c093c2628e (patch) | |
| tree | a4e04e115bfe66faf0bac6daac58c738d44f732e /src/modules/sensors/sensors.cpp | |
| parent | f4fc3bbd571ce99b707d326a206159a6eab49547 (diff) | |
| parent | dc5bcdda761e5f8f4f7f26a600f02df007ab1df6 (diff) | |
| download | px4-firmware-30405331bdd8f3b6b49801bf68a605c093c2628e.tar.gz px4-firmware-30405331bdd8f3b6b49801bf68a605c093c2628e.tar.bz2 px4-firmware-30405331bdd8f3b6b49801bf68a605c093c2628e.zip | |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'src/modules/sensors/sensors.cpp')
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index e4fb7416f..5722d2fdf 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -391,7 +391,7 @@ namespace sensors #endif static const int ERROR = -1; -Sensors *g_sensors; +Sensors *g_sensors = nullptr; } Sensors::Sensors() : @@ -1483,7 +1483,7 @@ int sensors_main(int argc, char *argv[]) if (!strcmp(argv[1], "start")) { if (sensors::g_sensors != nullptr) - errx(1, "sensors task already running"); + errx(0, "sensors task already running"); sensors::g_sensors = new Sensors; |