From 859f22a1093e98ecb416e63245e148a184c5b3a4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 5 Nov 2017 22:10:30 +0100 Subject: [PATCH] neutrino: respect user's infoviewer timeout settings for different modes Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/942c6415c50f61f7c398e689257e59de0275f96e Author: vanhofen Date: 2017-11-05 (Sun, 05 Nov 2017) Origin message was: ------------------ - neutrino: respect user's infoviewer timeout settings for different modes Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/neutrino.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 8e7169f33..d1497cacb 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2839,7 +2839,12 @@ void CNeutrinoApp::RealRun() else if( ( msg == CRCInput::RC_help ) || ( msg == CRCInput::RC_info) || ( msg == NeutrinoMessages::SHOW_INFOBAR ) ) { - bool show_info = ((msg != NeutrinoMessages::SHOW_INFOBAR) || (g_InfoViewer->is_visible || g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] != 0)); + bool enabled_by_timing = ( + ((mode == mode_tv || mode == mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] != 0) + || ((mode == mode_radio || mode == mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] != 0) + ); + bool show_info = ((msg != NeutrinoMessages::SHOW_INFOBAR) || (g_InfoViewer->is_visible || enabled_by_timing)); + // turn on LCD display CVFD::getInstance()->wake_up();