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

CTimerManager:: don't set wekup flag if box boot from zapto timer

Browse Source
This commit is contained in:
Jacek Jendrzej
2013-05-01 22:00:03 +02:00
committed by [CST] Focus
parent 81efa46265
commit 1396896dd1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -1820,7 +1820,7 @@ TIMER_START();
//timer start //timer start
bool timer_wakeup = false; bool timer_wakeup = false;
wake_up( timer_wakeup ); wake_up( timer_wakeup );
pthread_create (&timer_thread, NULL, timerd_main_thread, (void *) timer_wakeup); pthread_create (&timer_thread, NULL, timerd_main_thread, (void *) (timer_wakeup && g_settings.shutdown_timer_record_type));
timerd_thread_started = true; timerd_thread_started = true;
init_cec_setting = true; init_cec_setting = true;

3
src/timerd/timermanager.cpp
View File

@@ -61,6 +61,7 @@ void CTimerManager::Init(void)
eventServer = new CEventServer; eventServer = new CEventServer;
m_saveEvents = false; m_saveEvents = false;
m_isTimeSet = false; m_isTimeSet = false;
timer_is_rec = false;
wakeup = 0; wakeup = 0;
loadRecordingSafety(); loadRecordingSafety();
@@ -706,6 +707,8 @@ bool CTimerManager::shutdown()
dprintf("shutdown: nextAnnounceTime %ld\n", nextAnnounceTime); dprintf("shutdown: nextAnnounceTime %ld\n", nextAnnounceTime);
if ( event->eventType == CTimerd::TIMER_RECORD ) if ( event->eventType == CTimerd::TIMER_RECORD )
timer_is_rec = true; timer_is_rec = true;
else
timer_is_rec = false;
} }
} }
} }