channellist: try to respect users timeout settings when hiding infobar

Origin commit data
------------------
Branch: ni/coolstream
Commit: b2830a90a1
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2018-04-08 23:55:37 +02:00
parent 131e2d4bea
commit 3dc1c9b1a9

View File

@@ -1425,7 +1425,11 @@ int CChannelList::numericZap(int key)
CZapitChannel* chan = getChannel(chn); CZapitChannel* chan = getChannel(chn);
if (doZap) { 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(); g_InfoViewer->killTitle();
if(chan && SameTP(chan)) { if(chan && SameTP(chan)) {
@@ -1547,7 +1551,11 @@ void CChannelList::virtual_zap_mode(bool up)
g_InfoViewer->resetSwitchMode(); //disable virtual_zap_mode g_InfoViewer->resetSwitchMode(); //disable virtual_zap_mode
if (doZap) { 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(); g_InfoViewer->killTitle();
if(channel && SameTP(channel)) if(channel && SameTP(channel))
zapToChannel(channel); zapToChannel(channel);