core: clean up message registrations

Signed-off-by: Julian Oes <[email protected]>
mavlink · Oct 23, 2023 · 74fb8cd · 74fb8cd
1 parent f218021
commit 74fb8cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/mavsdk/core/mavlink_ftp_client.cpp b/src/mavsdk/core/mavlink_ftp_client.cpp
@@ -26,7 +26,10 @@ MavlinkFtpClient::MavlinkFtpClient(SystemImpl& system_impl) : _system_impl(syste
         this);
 }
 
-MavlinkFtpClient::~MavlinkFtpClient() {}
+MavlinkFtpClient::~MavlinkFtpClient()
+{
+    _system_impl.unregister_all_mavlink_message_handlers(this);
+}
 
 void MavlinkFtpClient::do_work()
 {

diff --git a/src/mavsdk/core/mavlink_ftp_server.cpp b/src/mavsdk/core/mavlink_ftp_server.cpp
@@ -190,6 +190,8 @@ void MavlinkFtpServer::process_mavlink_ftp_message(const mavlink_message_t& msg)
 
 MavlinkFtpServer::~MavlinkFtpServer()
 {
+    _server_component_impl.unregister_all_mavlink_message_handlers(this);
+
     std::lock_guard<std::mutex> lock(_mutex);
     _reset();
 }