Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-21 18:47:32 +02:00
3 changed files with 6 additions and 6 deletions

View File

@@ -58,7 +58,7 @@ CComponentsTimer::~CComponentsTimer()
void CComponentsTimer::runSharedTimerAction()
{
//start loop
string tn = "cc:"+name;
tn = "cc:"+name;
set_threadname(tn.c_str());
while(tm_enable && tm_interval > 0) {
tm_mutex.lock();

View File

@@ -65,7 +65,7 @@ class CComponentsTimer : public sigc::trackable
///name for the thread
std::string name;
std::string tn;
///mutex for timer
OpenThreads::Mutex tm_mutex;
///slot for restart signals