mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multituner

Browse Source
This commit is contained in:
[CST] Focus
2012-01-16 17:48:19 +04:00
parent 04ef64b0ab fe1fcbe426
commit 475f4d9893
20 changed files with 277 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -48,7 +48,6 @@
#include <neutrino.h>
#include <gui/infoviewer.h>
#include <gui/keybind_setup.h>
#include <gui/bouquetlist.h>
#include <gui/widget/icons.h>
#include <gui/widget/hintbox.h>
@@ -868,8 +867,7 @@ void CInfoViewer::loop(bool show_dot)
showIcon_16_9();
showIcon_Resolution();
} else if ((g_settings.remote_control_hardware != CKeybindSetup::REMOTECONTROL_NEO1) &&
( g_settings.virtual_zap_mode && ((msg == CRCInput::RC_right) || msg == CRCInput::RC_left ))) {
} else if ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) && ((msg == CRCInput::RC_right) || (msg == CRCInput::RC_left ))) {
virtual_zap_mode = true;
res = messages_return::cancel_all;
hideIt = true;