From ed0ae2b8e97cf5b8cb68dbcb11987008e1318e0a Mon Sep 17 00:00:00 2001 From: Alexandr Graschenkov Date: Thu, 21 May 2015 15:08:51 +0300 Subject: [PATCH] Update Tracking.cc Fix deadlock with `Reset()` and `CheckResetByPublishers()` --- src/Tracking.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tracking.cc b/src/Tracking.cc index 6af74003..d2a6c8db 100644 --- a/src/Tracking.cc +++ b/src/Tracking.cc @@ -1083,7 +1083,7 @@ void Tracking::CheckResetByPublishers() { { boost::mutex::scoped_lock lock(mMutexReset); - if(!mbReseting) + if(!bReseting || !mbReseting) { mbPublisherStopped=false; break;