From f445343e8b6510744de1b551cb876f9150b8808c Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 8 Aug 2010 10:40:31 +0000 Subject: [PATCH] fix ttx start git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@716 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/acb8750f5b3060af0b229a36ad36b5a839cb6426 Author: Jacek Jendrzej Date: 2010-08-08 (Sun, 08 Aug 2010) Origin message was: ------------------ -fix ttx start git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@716 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- data/locale/english.locale | 1 + src/gui/widget/menue.cpp | 3 +-- src/system/setting_helpers.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/locale/english.locale b/data/locale/english.locale index c790f441e..8851b6e71 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -929,6 +929,7 @@ videomenu.analog_hd_yprpb_scart YPbPr on scart (HD) videomenu.analog_hd_yprpb_cinch YPbPr on cinch (HD) videomenu.scart Scart videomenu.cinch Cinch +videomenu.hdmi_cec HDMI-CEC videomenu.hdmi_cec_mode HDMI-CEC mode videomenu.hdmi_cec_mode_off off videomenu.hdmi_cec_mode_tuner as Tuner diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 2c4f5bd52..c89c619c7 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -416,9 +416,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) fadeTimer = 0; fadeIn = false; } - if (!fadeOut) - fadeOut = true; if ((!fadeOut) && g_settings.widget_fade && fade) { + fadeOut = true; fadeTimer = g_RCInput->addTimer( FADE_TIME, false ); timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); msg = 0; diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 8828a7a47..0b7d2b0be 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -655,6 +655,7 @@ int CStreamFeaturesChangeExec::exec(CMenuTarget* parent, const std::string & act // StreamInfo.exec(NULL, ""); // } else if(actionKey == "teletext") { + g_RCInput->postMsg(CRCInput::RC_timeout, 0); g_RCInput->postMsg(CRCInput::RC_text, 0); #if 0 g_RCInput->clearRCMsg();