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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 9ff856310d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)
This commit is contained in:
vanhofen
2017-05-23 18:29:49 +02:00
parent 694eaa1cf4 4fff365eaf
commit d0744fcadf
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/adzap.cpp
View File

@@ -66,15 +66,16 @@ CAdZapMenu::CAdZapMenu()
sem_init(&sem, 0, 0); sem_init(&sem, 0, 0);
channelId = -1;
armed = false;
monitor = false;
alerted = false;
pthread_t thr; pthread_t thr;
if (pthread_create(&thr, 0, CAdZapMenu::Run, this)) if (pthread_create(&thr, 0, CAdZapMenu::Run, this))
fprintf(stderr, "ERROR: pthread_create(CAdZapMenu::CAdZapMenu)\n"); fprintf(stderr, "ERROR: pthread_create(CAdZapMenu::CAdZapMenu)\n");
else else
pthread_detach(thr); pthread_detach(thr);
channelId = -1;
armed = false;
monitor = false;
alerted = false;
} }
static bool sortByDateTime(const CChannelEvent & a, const CChannelEvent & b) static bool sortByDateTime(const CChannelEvent & a, const CChannelEvent & b)

2
src/gui/screensaver.cpp
View File

@@ -174,7 +174,7 @@ void* CScreenSaver::ScreenSaverPrg(void* arg)
if (g_settings.screensaver_timeout) if (g_settings.screensaver_timeout)
{ {
while(1) while(PScreenSaver)
{ {
PScreenSaver->paint(); PScreenSaver->paint();
sleep(g_settings.screensaver_timeout); sleep(g_settings.screensaver_timeout);