mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino.cpp:skip saveepg if box start to standby

Browse Source
This commit is contained in:
satbaby
2012-08-09 14:29:11 +02:00
parent 434ac74066
commit d1850d6e90
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neutrino.cpp
View File

@@ -2007,7 +2007,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
} }
g_RCInput->clearRCMsg(); g_RCInput->clearRCMsg();
if(g_settings.power_standby || init_cec_setting) if(g_settings.power_standby || init_cec_setting)
standbyMode(true); standbyMode(true, true);
InfoClock = CInfoClock::getInstance(); InfoClock = CInfoClock::getInstance();
if(g_settings.mode_clock) if(g_settings.mode_clock)
@@ -2926,7 +2926,6 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
//SDTreloadChannels = false; //SDTreloadChannels = false;
} }
CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN);
delete CRecordManager::getInstance(); delete CRecordManager::getInstance();
@@ -2940,6 +2939,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) { if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) {
saveEpg(true);// true CVFD::MODE_SHUTDOWN saveEpg(true);// true CVFD::MODE_SHUTDOWN
} }
CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN);
stop_daemons(true /*retcode*/);//need here for timer_is_rec before saveSetup stop_daemons(true /*retcode*/);//need here for timer_is_rec before saveSetup
g_settings.shutdown_timer_record_type = timer_is_rec; g_settings.shutdown_timer_record_type = timer_is_rec;
@@ -3178,7 +3178,7 @@ void CNeutrinoApp::scartMode( bool bOnOff )
} }
} }
void CNeutrinoApp::standbyMode( bool bOnOff ) void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
{ {
static bool wasshift = false; static bool wasshift = false;
INFO("%s", bOnOff ? "ON" : "OFF" ); INFO("%s", bOnOff ? "ON" : "OFF" );
@@ -3211,9 +3211,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
g_Sectionsd->setPauseScanning(true); g_Sectionsd->setPauseScanning(true);
g_Sectionsd->setServiceChanged(0, false); g_Sectionsd->setServiceChanged(0, false);
if(!CRecordManager::getInstance()->RecordingStatus()) { if(!CRecordManager::getInstance()->RecordingStatus() ) {
//only save epg when not recording //only save epg when not recording
if(g_settings.epg_save) { if(g_settings.epg_save && !fromDeepStandby) {
saveEpg(false);//false CVFD::MODE_STANDBY saveEpg(false);//false CVFD::MODE_STANDBY
} }
} }

2
src/neutrino.h
View File

@@ -134,7 +134,7 @@ private:
void tvMode( bool rezap = true ); void tvMode( bool rezap = true );
void radioMode( bool rezap = true ); void radioMode( bool rezap = true );
void scartMode( bool bOnOff ); void scartMode( bool bOnOff );
void standbyMode( bool bOnOff ); void standbyMode( bool bOnOff, bool fromDeepStandby = false );
void saveEpg(bool cvfd_mode); void saveEpg(bool cvfd_mode);
void ExitRun(const bool write_si = true, int retcode = 0); void ExitRun(const bool write_si = true, int retcode = 0);