mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/movieplayer.cpp, neutrino.cpp: fix inactivity timer -

Browse Source 
do not stop playback to show cancel timer question
This commit is contained in:
[CST] Focus
2013-11-22 13:23:50 +04:00
parent 8a2185c32e
commit e2ae51ae84
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/movieplayer.cpp
View File

@@ -799,7 +799,7 @@ void CMoviePlayerGui::PlayFile(void)
} else if ( msg == NeutrinoMessages::ZAPTO || } else if ( msg == NeutrinoMessages::ZAPTO ||
msg == NeutrinoMessages::STANDBY_ON || msg == NeutrinoMessages::STANDBY_ON ||
msg == NeutrinoMessages::SHUTDOWN || msg == NeutrinoMessages::SHUTDOWN ||
msg == NeutrinoMessages::SLEEPTIMER) { // Exit for Record/Zapto Timers ((msg == NeutrinoMessages::SLEEPTIMER) && !data) ) { // Exit for Record/Zapto Timers
printf("CMoviePlayerGui::PlayFile: ZAPTO etc..\n"); printf("CMoviePlayerGui::PlayFile: ZAPTO etc..\n");
if(msg != NeutrinoMessages::ZAPTO) if(msg != NeutrinoMessages::ZAPTO)
menu_ret = menu_return::RETURN_EXIT_ALL; menu_ret = menu_return::RETURN_EXIT_ALL;

6
src/neutrino.cpp
View File

@@ -2864,9 +2864,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
} }
} }
if(g_settings.shutdown_real) if(g_settings.shutdown_real)
ExitRun(true, (cs_get_revision() > 7)); g_RCInput->postMsg(NeutrinoMessages::SHUTDOWN, 0);
else if(mode != mode_standby) else
standbyMode( true ); g_RCInput->postMsg(NeutrinoMessages::STANDBY_ON, 0);
return messages_return::handled; return messages_return::handled;
} }
else if( msg == NeutrinoMessages::RELOAD_SETUP ) { else if( msg == NeutrinoMessages::RELOAD_SETUP ) {