fix abort in some cases with DDS

IntelRealSense · Dec 24, 2024 · b5e1c7c · b5e1c7c
1 parent e18af41
commit b5e1c7c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/third-party/realdds/src/dds-network-adapter-watcher.cpp b/third-party/realdds/src/dds-network-adapter-watcher.cpp
@@ -72,8 +72,14 @@ class network_adapter_watcher_singleton
     ~network_adapter_watcher_singleton()
     {
         _adapter_watcher.reset();  // signal the thread to finish
-        if( _th.joinable() )
-            _th.join();
+        try {
+            if (_th.joinable())
+                _th.join();
+        }
+        catch (std::system_error&)
+        {
+            std::cerr << "join failed, thread might no longer be joinable";
+        }
     }
 
     void update_ips( ip_set * p_new_ips = nullptr, ip_set * p_old_ips = nullptr )