From bb36999868a0defd2a2ba2b36603fdbda45230a1 Mon Sep 17 00:00:00 2001 From: Felix Mauch Date: Tue, 11 Jun 2019 17:49:39 +0200 Subject: [PATCH] only join cThread if created --- ur_rtde_driver/include/ur_rtde_driver/comm/pipeline.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ur_rtde_driver/include/ur_rtde_driver/comm/pipeline.h b/ur_rtde_driver/include/ur_rtde_driver/comm/pipeline.h index 6a85056..608da29 100644 --- a/ur_rtde_driver/include/ur_rtde_driver/comm/pipeline.h +++ b/ur_rtde_driver/include/ur_rtde_driver/comm/pipeline.h @@ -185,7 +185,10 @@ public: running_ = false; pThread_.join(); - cThread_.join(); + if (cThread_.joinable()) + { + cThread_.join(); + } notifier_.stopped(name_); }