From 8d2c9fcf561ff41179e27acfce27ff7678c8fd69 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 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f736dfa2543ca34a03b46bfbed5d610b2eb0e88d Author: vanhofen Date: 2017-11-05 (Sun, 05 Nov 2017) Origin message was: ------------------ - neutrino: respect user's infoviewer timeout settings for different modes --- src/neutrino.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 687f6d8a2..6165e636e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3041,7 +3041,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();