diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ac10ac853..4d2beff48 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2911,7 +2911,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg"); if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) { - saveEpg(); + saveEpg(true);// true CVFD::MODE_SHUTDOWN } stop_daemons(retcode);//need here for timer_is_rec before saveSetup @@ -3052,18 +3052,26 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) } } -void CNeutrinoApp::saveEpg() +void CNeutrinoApp::saveEpg(bool cvfd_mode) { struct stat my_stat; if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0){ - printf("Saving EPG to %s....\n", g_settings.epg_dir.c_str()); + const char *save_txt = "Saving EPG"; + printf("%s to %s....\n",save_txt, g_settings.epg_dir.c_str()); neutrino_msg_t msg; neutrino_msg_data_t data; + + CVFD::getInstance()->Clear(); + CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); + CVFD::getInstance ()->ShowText(save_txt); + g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str()); while( true ) { g_RCInput->getMsg(&msg, &data, 1200); // 120 secs.. if (( msg == CRCInput::RC_timeout ) || (msg == NeutrinoMessages::EVT_SI_FINISHED)) { //printf("Msg %x timeout %d EVT_SI_FINISHED %x\n", msg, CRCInput::RC_timeout, NeutrinoMessages::EVT_SI_FINISHED); + CVFD::getInstance()->Clear(); + CVFD::getInstance()->setMode(cvfd_mode ? CVFD::MODE_SHUTDOWN : CVFD::MODE_STANDBY);// true CVFD::MODE_SHUTDOWN , false CVFD::MODE_STANDBY break; } } @@ -3359,7 +3367,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff ) if(!CRecordManager::getInstance()->RecordingStatus()) { //only save epg when not recording if(g_settings.epg_save) { - saveEpg(); + saveEpg(false);//false CVFD::MODE_STANDBY } } diff --git a/src/neutrino.h b/src/neutrino.h index 117a7ae90..8c732fb85 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -156,7 +156,7 @@ private: void standbyMode( bool bOnOff ); void AudioMute( int newValue, bool isEvent= false ); void setvol(int vol); - void saveEpg(); + void saveEpg(bool cvfd_mode); void ExitRun(const bool write_si = true, int retcode = 0); void RealRun(CMenuWidget &mainSettings);