mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/filebrowser.cpp: save return status to check if all gui must be closed

Browse Source
This commit is contained in:
[CST] Focus
2012-11-16 15:36:59 +04:00
parent 1ca7ced674
commit f02a95e04d
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/filebrowser.cpp
View File

@@ -838,6 +838,7 @@ bool CFileBrowser::exec(const char * const dirname)
neutrino_msg_data_t data; neutrino_msg_data_t data;
bool res = false; bool res = false;
menu_ret = menu_return::RETURN_REPAINT;
#ifdef ENABLE_INTERNETRADIO #ifdef ENABLE_INTERNETRADIO
if (m_Mode == ModeSC) { if (m_Mode == ModeSC) {
@@ -1105,10 +1106,20 @@ bool CFileBrowser::exec(const char * const dirname)
else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) {
//FIXME do nothing ? //FIXME do nothing ?
} }
else if (msg == NeutrinoMessages::STANDBY_ON ||
msg == NeutrinoMessages::SHUTDOWN ||
msg == NeutrinoMessages::SLEEPTIMER)
{
menu_ret = menu_return::RETURN_EXIT_ALL;
loop = false;
g_RCInput->postMsg(msg, data);
}
else else
{ {
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all )
{ {
menu_ret = menu_return::RETURN_EXIT_ALL;
loop = false; loop = false;
} }
} }

2
src/gui/filebrowser.h
View File

@@ -177,6 +177,7 @@ class CFileBrowser
int x; int x;
int y; int y;
int menu_ret;
SMSKeyInput m_SMSKeyInput; SMSKeyInput m_SMSKeyInput;
@@ -229,6 +230,7 @@ class CFileBrowser
{ {
return Path; return Path;
} }
int getMenuRet() { return menu_ret; }
// size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data); // size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data);
private: private: