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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/bedit/bouqueteditor_channels.cpp


Origin commit data
------------------
Commit: 736c1969fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)
This commit is contained in:
vanhofen
2017-09-24 22:37:37 +02:00
parent caaa8b9cc5 7d704b161c
commit 3a2e241870
12 changed files with 996 additions and 795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ CComponentsTimer::~CComponentsTimer()
void CComponentsTimer::runSharedTimerAction()
{
//start loop
string tn = "cc:"+name;
tn = "cc:"+name;
set_threadname(tn.c_str());
while(tm_enable && tm_interval > 0) {
tm_mutex.lock();

2
src/gui/components/cc_timer.h
View File

@@ -65,7 +65,7 @@ class CComponentsTimer : public sigc::trackable
///name for the thread
std::string name;
std::string tn;
///mutex for timer
OpenThreads::Mutex tm_mutex;
///slot for restart signals