mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-06 21:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino.cpp: start epg scan after leaving menu, if epg scan option changed

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85b25750d5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-12-19 19:46:27 +04:00
parent 697b013dc1
commit 8e99f18448
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -2104,12 +2104,17 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
StopSubtitles(); StopSubtitles();
InfoClock->enableInfoClock(false); InfoClock->enableInfoClock(false);
int old_ttx = g_settings.cacheTXT; int old_ttx = g_settings.cacheTXT;
int old_epg = g_settings.epg_scan;
mainMenu.exec(NULL, ""); mainMenu.exec(NULL, "");
InfoClock->enableInfoClock(true); InfoClock->enableInfoClock(true);
StartSubtitles(); StartSubtitles();
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
if (!g_settings.epg_scan) if (old_epg != g_settings.epg_scan) {
if (g_settings.epg_scan)
CEpgScan::getInstance()->Start();
else
CEpgScan::getInstance()->Clear(); CEpgScan::getInstance()->Clear();
}
if (old_ttx != g_settings.cacheTXT) { if (old_ttx != g_settings.cacheTXT) {
if(g_settings.cacheTXT) { if(g_settings.cacheTXT) {
tuxtxt_init(); tuxtxt_init();
@@ -3347,13 +3352,13 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
frameBuffer->setActive(false); frameBuffer->setActive(false);
// Active standby on // Active standby on
powerManager->SetStandby(false, false); powerManager->SetStandby(false, false);
CEpgScan::getInstance()->StartStandby(); CEpgScan::getInstance()->Start(true);
} else { } else {
// Active standby off // Active standby off
powerManager->SetStandby(false, false); powerManager->SetStandby(false, false);
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
videoDecoder->Standby(false); videoDecoder->Standby(false);
CEpgScan::getInstance()->StopStandby(); CEpgScan::getInstance()->Stop();
if(init_cec_setting){ if(init_cec_setting){
//init cec settings //init cec settings