mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: c7fa4276e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-28 (Wed, 28 Dec 2016)
This commit is contained in:
vanhofen
2016-12-28 20:24:39 +01:00
parent 0b8fb6f5bd dcaef3e666
commit 465c6ce561
4 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,22 +107,22 @@ void CComponentsTimer::initThread()
void CComponentsTimer::stopThread()
{
//ensure disconnecting possible slots
while (!sl_stop_timer.empty())
sl_stop_timer.disconnect();
if(tm_thread) {
int thres = pthread_cancel(tm_thread);
if (thres != 0)
dprintf(DEBUG_NORMAL,"\033[33m[CComponentsTimer] [%s - %d] ERROR! pthread_cancel\033[0m\n", __func__, __LINE__);
dprintf(DEBUG_NORMAL,"\033[33m[CComponentsTimer] [%s - %d] ERROR! pthread_cancel, [%d]\033[0m\n", __func__, __LINE__, thres);
thres = pthread_join(tm_thread, NULL);
if (thres != 0)
dprintf(DEBUG_NORMAL, "\033[33m[CComponentsTimer] [%s - %d] ERROR! pthread_join\033[0m\n", __func__, __LINE__);
dprintf(DEBUG_NORMAL, "\033[33m[CComponentsTimer] [%s - %d] ERROR! pthread_join, [%d]\033[0m\n", __func__, __LINE__, thres);
if (thres == 0){
if (thres == 0)
tm_thread = 0;
//ensure disconnect of unused slot
while (!sl_stop_timer.empty())
sl_stop_timer.disconnect();
}
}
}