From d2ca2e505a32d458fe0a0ca4bc66d510ab561faf Mon Sep 17 00:00:00 2001 From: focus Date: Fri, 25 Nov 2011 09:38:00 +0000 Subject: [PATCH] Close all on menu key; allow sat and fav keys git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1891 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/imageinfo.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 2a0ebd1f8..5807eabd4 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -108,6 +108,7 @@ CImageInfo::~CImageInfo() int CImageInfo::exec(CMenuTarget* parent, const std::string &) { + int res = menu_return::RETURN_REPAINT; if (parent) parent->hide(); @@ -129,7 +130,16 @@ int CImageInfo::exec(CMenuTarget* parent, const std::string &) uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS(100); g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); - if (msg <= CRCInput::RC_MaxRC) + if(msg == CRCInput::RC_setup) { + res = menu_return::RETURN_EXIT_ALL; + break; + } + else if((msg == CRCInput::RC_sat) || (msg == CRCInput::RC_favorites)) { + g_RCInput->postMsg (msg, 0); + res = menu_return::RETURN_EXIT_ALL; + break; + } + else if (msg <= CRCInput::RC_MaxRC) { break; } @@ -142,7 +152,7 @@ int CImageInfo::exec(CMenuTarget* parent, const std::string &) hide(); - return menu_return::RETURN_REPAINT; + return res; } void CImageInfo::hide()