mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-14 13:54:04 +02:00
parent 98a31ea821 97442240f8
commit 2ebb47f519
61 changed files with 50439 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/components/cc_timer.cpp
View File

@@ -43,11 +43,11 @@ CComponentsTimer::CComponentsTimer(const int& interval, bool is_nano)
tm_thread = 0;
tm_interval = interval;
tm_enable_nano = is_nano;
tm_enable = false;
sl_stop_timer = sigc::mem_fun(*this, &CComponentsTimer::stopTimer);
if (interval > 0)
startTimer();
tm_enable = startTimer();
}
CComponentsTimer::~CComponentsTimer()
@@ -132,12 +132,11 @@ void CComponentsTimer::stopThread()
bool CComponentsTimer::startTimer()
{
tm_enable = true;
initThread();
if(tm_thread)
return true;
tm_enable = true;
return false;
return tm_enable;
}
bool CComponentsTimer::stopTimer()