unbreak msgbox

the "if (msg)" was basically always true, killing all keys that were not
handled in this clause (e.g. it was not possible to switch the box from
standby if a plugin with output was running during standby)


Origin commit data
------------------
Branch: ni/coolstream
Commit: f9b7fca210
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-03-04 19:49:48 +01:00
committed by Michael Liebmann
parent 589ffd92e5
commit 56ddedaa39

View File

@@ -276,9 +276,8 @@ int CMsgBox::exec()
{ {
scroll_down(); scroll_down();
} }
else if (msg){
//***navi buttons for button selection*** //***navi buttons for button selection***
if(msg==CRCInput::RC_right || msg==CRCInput::RC_left) else if(msg == CRCInput::RC_right || msg == CRCInput::RC_left)
{ {
if (msg == CRCInput::RC_right) { if (msg == CRCInput::RC_right) {
ccw_footer->setSelectedButton(selected+1); ccw_footer->setSelectedButton(selected+1);
@@ -323,7 +322,6 @@ int CMsgBox::exec()
else if (CNeutrinoApp::getInstance()->listModeKey(msg)){ else if (CNeutrinoApp::getInstance()->listModeKey(msg)){
// do nothing //TODO: if passed rc messages are ignored rc messaages: has no effect here too!! // do nothing //TODO: if passed rc messages are ignored rc messaages: has no effect here too!!
} }
}
else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all) else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all)
{ {
dprintf(DEBUG_INFO, "\033[32m[CMsgBox] [%s - %d] messages_return::cancel_all\033[0m\n", __func__, __LINE__); dprintf(DEBUG_INFO, "\033[32m[CMsgBox] [%s - %d] messages_return::cancel_all\033[0m\n", __func__, __LINE__);