From 1f127ec8a70f105c222a34c4f41a426fbe533516 Mon Sep 17 00:00:00 2001 From: Avia Avraham <145359432+AviaAv@users.noreply.github.com> Date: Sun, 29 Dec 2024 14:53:40 +0200 Subject: [PATCH] remove thread detachment --- .../realdds/src/dds-network-adapter-watcher.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/third-party/realdds/src/dds-network-adapter-watcher.cpp b/third-party/realdds/src/dds-network-adapter-watcher.cpp index 5a6ba90e72..8f62b25043 100644 --- a/third-party/realdds/src/dds-network-adapter-watcher.cpp +++ b/third-party/realdds/src/dds-network-adapter-watcher.cpp @@ -60,7 +60,6 @@ class network_adapter_watcher_singleton if( new_ips.size() || old_ips.size() ) callbacks.raise( new_ips, old_ips ); } - _th.detach(); // so it's not joinable LOG_DEBUG( "done waiting for IP changes" ); } ); } @@ -72,15 +71,8 @@ class network_adapter_watcher_singleton ~network_adapter_watcher_singleton() { _adapter_watcher.reset(); // signal the thread to finish - try - { - if (_th.joinable()) - _th.join(); - } - catch (std::system_error& e) - { - LOG_ERROR("Network adapter watcher termination failed: " << e.what()); - } + if (_th.joinable()) + _th.join(); } void update_ips( ip_set * p_new_ips = nullptr, ip_set * p_old_ips = nullptr )