From 1396896dd1f5914eaa9c4eaaf06fefe00be4a4e5 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 1 May 2013 22:00:03 +0200 Subject: [PATCH] CTimerManager:: don't set wekup flag if box boot from zapto timer --- src/neutrino.cpp | 2 +- src/timerd/timermanager.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 0958ec7c3..134614dac 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1820,7 +1820,7 @@ TIMER_START(); //timer start bool timer_wakeup = false; 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; init_cec_setting = true; diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 3d77889d6..3b11dfdec 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -61,6 +61,7 @@ void CTimerManager::Init(void) eventServer = new CEventServer; m_saveEvents = false; m_isTimeSet = false; + timer_is_rec = false; wakeup = 0; loadRecordingSafety(); @@ -706,6 +707,8 @@ bool CTimerManager::shutdown() dprintf("shutdown: nextAnnounceTime %ld\n", nextAnnounceTime); if ( event->eventType == CTimerd::TIMER_RECORD ) timer_is_rec = true; + else + timer_is_rec = false; } } }