[network] Improve device release safety

ossia · Jun 13, 2024 · 69a25b2 · 69a25b2
1 parent 70766d2
commit 69a25b2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/plugins/score-lib-device/Device/Protocol/DeviceInterface.cpp b/src/plugins/score-lib-device/Device/Protocol/DeviceInterface.cpp
@@ -1019,21 +1019,22 @@ void releaseDevice(
 {
   if(dd)
   {
+    auto shared_dd = std::shared_ptr(std::move(dd));
     auto strand = boost::asio::make_strand(ctx.context);
-    boost::asio::dispatch(ctx.context, [&dev = dd] { dev->get_protocol().stop(); });
+    boost::asio::dispatch(strand, [dev = shared_dd] { dev->get_protocol().stop(); });
 
     std::future<void> wait1
-        = boost::asio::dispatch(ctx.context, boost::asio::use_future);
+        = boost::asio::dispatch(strand, boost::asio::use_future);
     if(auto res = wait1.wait_for(std::chrono::seconds(1));
        res != std::future_status::ready)
     {
       qDebug() << "Device deletion: asio thread seems stuck (1)";
     }
 
-    boost::asio::dispatch(ctx.context, [d = std::move(dd)]() mutable { d.reset(); });
+    boost::asio::dispatch(strand, [d = std::move(shared_dd)]() mutable { d.reset(); });
 
     std::future<void> wait2
-        = boost::asio::dispatch(ctx.context, boost::asio::use_future);
+        = boost::asio::dispatch(strand, boost::asio::use_future);
     if(auto res = wait2.wait_for(std::chrono::seconds(1));
        res != std::future_status::ready)
     {