neutrino.cpp: fix subchannel up/down processing:

if key_subchannel_up/down is set to different than left/right keys,
and mode_left_right_key_tv == SNeutrinoSettings::VOLUME, CVolume::setVolume called,
but not process other keys, and post msg again -> loop forever.
- process mode_left_right_key_tv modes only if subchannel up/down == left/right
This commit is contained in:
[CST] Focus
2012-12-04 14:52:03 +04:00
parent c77138f260
commit d5cd463e17

View File

@@ -2050,14 +2050,17 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
g_RemoteControl->subChannelDown(); g_RemoteControl->subChannelDown();
g_InfoViewer->showSubchan(); g_InfoViewer->showSubchan();
} }
else if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) { else if ( msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) {
g_volume->setVolume(msg, true); g_volume->setVolume(msg, true);
} }
else if((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) || (g_settings.mode_left_right_key_tv == SNeutrinoSettings::INFOBAR)) { else if((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP)
|| (g_settings.mode_left_right_key_tv == SNeutrinoSettings::INFOBAR)) {
if(channelList->getSize()) { if(channelList->getSize()) {
showInfo(); showInfo();
} }
} }
}
else else
quickZap( msg ); quickZap( msg );
} }