aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-02-10 15:13:31 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-02-10 16:31:24 +0100
commit5fae142bbc1dfd5074a7832bb4ec1b14d96b8008 (patch)
treef226f71a1f9a062e95499815771475a522a34706
parent90afddbdc8e04f606963acdb88273be477ddd6e7 (diff)
downloadpx4-firmware-5fae142bbc1dfd5074a7832bb4ec1b14d96b8008.tar.gz
px4-firmware-5fae142bbc1dfd5074a7832bb4ec1b14d96b8008.tar.bz2
px4-firmware-5fae142bbc1dfd5074a7832bb4ec1b14d96b8008.zip
Delete stream name in same thread as where its created
-rw-r--r--src/modules/mavlink/mavlink_main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 79a35f1e7..fa91015cd 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -1027,6 +1027,8 @@ Mavlink::configure_stream_threadsafe(const char *stream_name, const float rate)
do {
usleep(MAIN_LOOP_DELAY / 2);
} while (_subscribe_to_stream != nullptr);
+
+ delete s;
}
}
@@ -1448,7 +1450,6 @@ Mavlink::task_main(int argc, char *argv[])
warnx("stream %s on device %s not found", _subscribe_to_stream, _device_name);
}
- delete _subscribe_to_stream;
_subscribe_to_stream = nullptr;
}