Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 756f464a3f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-19 (Tue, 19 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
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
void CComponentsTimer::initThread()
{
if (!tm_enable)
return;
if(!tm_thread) {
void *ptr = static_cast<void*>(this);