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

CComponentsTimer: disconnecting slots before stop timer thread, show error

Browse Source 
Disconnecting of slots before stop threads ensures disconnecting
also on thread errors and keeps timer slots clear.
This commit is contained in:
Thilo Graf
2016-12-27 11:30:58 +01:00
parent 26ec29dc79
commit 3cd509aa2d
1 changed files with 7 additions and 7 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() void CComponentsTimer::stopThread()
{ {
//ensure disconnecting possible slots
while (!sl_stop_timer.empty())
sl_stop_timer.disconnect();
if(tm_thread) { if(tm_thread) {
int thres = pthread_cancel(tm_thread); int thres = pthread_cancel(tm_thread);
if (thres != 0) 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); thres = pthread_join(tm_thread, NULL);
if (thres != 0) 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; tm_thread = 0;
//ensure disconnect of unused slot
while (!sl_stop_timer.empty())
sl_stop_timer.disconnect();
}
} }
} }