Merge remote-tracking branch 'origin/master' into dvbsi++

Origin commit data
------------------
Branch: ni/coolstream
Commit: e9430aec0d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-02-19 13:20:19 +04:00
46 changed files with 392 additions and 150 deletions

View File

@@ -852,7 +852,10 @@ void CInfoViewer::loop(bool show_dot)
while (!(res & (messages_return::cancel_info | messages_return::cancel_all))) {
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) {
if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
res = CNeutrinoApp::getInstance()->handleMsg(msg, data);
} else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) {
g_RCInput->postMsg (msg, 0);
res = messages_return::cancel_info;
}