Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-19 12:40:58 +02:00

View File

@@ -87,9 +87,6 @@ void* CComponentsTimer::initThreadAction(void *arg)
//start up running timer with own thread, return true on succses //start up running timer with own thread, return true on succses
void CComponentsTimer::initThread() void CComponentsTimer::initThread()
{ {
if (!tm_enable)
return;
if(!tm_thread) { if(!tm_thread) {
void *ptr = static_cast<void*>(this); void *ptr = static_cast<void*>(this);