From 4a967d86b5df0a47efe95f4cad0900b42405eef0 Mon Sep 17 00:00:00 2001 From: focus Date: Sun, 25 Dec 2011 11:39:58 +0000 Subject: [PATCH] dont reset CI if recording running git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2001 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/neutrino.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index dc78da0ef..736765e31 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -188,8 +188,6 @@ CCAMMenuHandler * g_CamHandler; bool parentallocked = false; static char **global_argv; -CFontSizeNotifier fontsizenotifier; - extern const char * locale_real_names[]; /* #include */ // USERMENU const char* usermenu_button_def[SNeutrinoSettings::BUTTON_MAX]={"red","green","yellow","blue"}; @@ -2570,7 +2568,7 @@ _repeat: //FIXME better at announce ? if( mode == mode_standby ) { cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); - if(g_settings.ci_standby_reset) { + if(!recordingstatus && g_settings.ci_standby_reset) { g_CamHandler->exec(NULL, "ca_ci_reset0"); g_CamHandler->exec(NULL, "ca_ci_reset1"); } @@ -3405,7 +3403,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff ) powerManager->SetStandby(false, false); - if(g_settings.ci_standby_reset) { + if(!recordingstatus && g_settings.ci_standby_reset) { g_CamHandler->exec(NULL, "ca_ci_reset0"); g_CamHandler->exec(NULL, "ca_ci_reset1"); }