diff --git a/src/modules/mavlink/mavlink_command_sender.cpp b/src/modules/mavlink/mavlink_command_sender.cpp index 1c22dfe72b..fb6006fddc 100644 --- a/src/modules/mavlink/mavlink_command_sender.cpp +++ b/src/modules/mavlink/mavlink_command_sender.cpp @@ -42,25 +42,20 @@ #include #include -bool MavlinkCommandSender::_init = false; MavlinkCommandSender *MavlinkCommandSender::_instance = nullptr; px4_sem_t MavlinkCommandSender::_lock; void MavlinkCommandSender::initialize() { - if (_init) { - return; - } - px4_sem_init(&_lock, 1, 1); - _init = true; -} -MavlinkCommandSender &MavlinkCommandSender::instance() -{ if (_instance == nullptr) { _instance = new MavlinkCommandSender(); } +} + +MavlinkCommandSender &MavlinkCommandSender::instance() +{ return *_instance; } diff --git a/src/modules/mavlink/mavlink_command_sender.h b/src/modules/mavlink/mavlink_command_sender.h index 9f5cdd0cb8..8adc4542b0 100644 --- a/src/modules/mavlink/mavlink_command_sender.h +++ b/src/modules/mavlink/mavlink_command_sender.h @@ -98,10 +98,7 @@ private: px4_sem_post(&_lock); } - - static bool _init; static MavlinkCommandSender *_instance; - static px4_sem_t _lock; // There are MAVLINK_COMM_0 to MAVLINK_COMM_3, so it should be 4.