mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 00:41:17 +02:00
- channellist: try to respect users timeout settings when hiding infobar
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -1408,7 +1408,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)) {
|
||||||
@@ -1530,7 +1534,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);
|
||||||
|
Reference in New Issue
Block a user