FIx bad thread join.

Quicr · Jun 3, 2024 · 93eda5e · 93eda5e
1 parent e3ea500
commit 93eda5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/quicr_client_raw_session.cpp b/src/quicr_client_raw_session.cpp
@@ -145,7 +145,9 @@ ClientRawSession::~ClientRawSession()
     disconnect();
   }
 
-  _metrics_thread.join();
+  if (_metrics_thread.joinable()) {
+    _metrics_thread.join();
+  }
 }
 
 bool
@@ -1018,7 +1020,7 @@ ClientRawSession::handle(std::optional<uint64_t> stream_id,
                    << std::flush;
 
       if (metrics_namespace) {
-        publishIntent(std::make_shared<MetricsPublishDelegate>(*this),
+        publishIntent(std::make_shared<MetricsPublishDelegate>([this] { this->runPublishMeasurements(); }),
                       *metrics_namespace,
                       "",
                       "",
@@ -1198,6 +1200,6 @@ ClientRawSession::MetricsPublishDelegate::onPublishIntentResponse(
   if (result.status != messages::Response::Ok)
     return;
 
-  session.runPublishMeasurements();
+  start_metrics_callback();
 }
 } // namespace quicr
diff --git a/src/quicr_client_raw_session.h b/src/quicr_client_raw_session.h
@@ -26,6 +26,7 @@
 #include <transport/transport.h>
 
 #include <atomic>
+#include <functional>
 #include <map>
 #include <memory>
 #include <string>
@@ -366,11 +367,11 @@ class ClientRawSession
 
   struct MetricsPublishDelegate : public PublisherDelegate
   {
-    MetricsPublishDelegate(ClientRawSession& s) : session{s} {}
+    MetricsPublishDelegate(const std::function<void()>& cb) : start_metrics_callback{cb} {}
     void onPublishIntentResponse(const quicr::Namespace& quicr_namespace,
                                  const PublishIntentResult& result) override;
 
-    ClientRawSession& session;
+    std::function<void()> start_metrics_callback;
   };
   friend MetricsPublishDelegate;