From 3dc1c9b1a9df63d786bf023411737bd93483f3e6 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 8 Apr 2018 23:55:37 +0200 Subject: [PATCH] channellist: try to respect users timeout settings when hiding infobar Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b2830a90a131ee2b4bc3738dea561256e271d2f7 Author: vanhofen Date: 2018-04-08 (Sun, 08 Apr 2018) Origin message was: ------------------ - channellist: try to respect users timeout settings when hiding infobar ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index beb7c1976..2e97c5f4f 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1425,7 +1425,11 @@ int CChannelList::numericZap(int key) CZapitChannel* chan = getChannel(chn); if (doZap) { - if(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0) + int mode = CNeutrinoApp::getInstance()->getMode(); + if ( + ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0) || + ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0) + ) g_InfoViewer->killTitle(); if(chan && SameTP(chan)) { @@ -1547,7 +1551,11 @@ void CChannelList::virtual_zap_mode(bool up) g_InfoViewer->resetSwitchMode(); //disable virtual_zap_mode if (doZap) { - if(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0) + int mode = CNeutrinoApp::getInstance()->getMode(); + if ( + ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0) || + ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0) + ) g_InfoViewer->killTitle(); if(channel && SameTP(channel)) zapToChannel(channel);