mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
Merge branch 'master' into multituner
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97b72836a9
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:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user