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

- neutrino: grab whole ExitRun() from neutrino-mp ...

Browse Source 
This fixes my last merge commit, small typos and alignes indentation.
This commit is contained in:
svenhoefer
2017-03-21 10:29:35 +01:00
parent 1373662e31
commit d2f02371e8
1 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/neutrino.cpp
View File

@@ -3602,6 +3602,7 @@ extern bool timer_is_rec;//timermanager.cpp
void CNeutrinoApp::ExitRun(int can_shutdown) void CNeutrinoApp::ExitRun(int can_shutdown)
{ {
/* can_shutdown is actually our exit code */
printf("[neutrino] %s can_shutdown: %d\n", __func__, can_shutdown); printf("[neutrino] %s can_shutdown: %d\n", __func__, can_shutdown);
bool do_shutdown = true; bool do_shutdown = true;
@@ -3641,7 +3642,7 @@ void CNeutrinoApp::ExitRun(int can_shutdown)
CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN); CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN);
stop_daemons(true /*can_shoutdown*/); //need here for timer_is_rec before saveSetup stop_daemons(true /*can_shutdown*/); //need here for timer_is_rec before saveSetup
g_settings.shutdown_timer_record_type = timer_is_rec; g_settings.shutdown_timer_record_type = timer_is_rec;
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
@@ -3729,6 +3730,16 @@ void CNeutrinoApp::ExitRun(int can_shutdown)
} }
else else
{ {
delete g_RCInput;
my_system("/etc/init.d/rcK");
//fan speed
if (g_info.hw_caps->has_fan)
CFanControlNotifier::setSpeed(0);
stop_video();
Cleanup();
//_exit(0);
exit(0);
}
#endif #endif
int leds = 0; int leds = 0;
int bright = 0; int bright = 0;
@@ -3775,9 +3786,8 @@ void CNeutrinoApp::ExitRun(int can_shutdown)
delete g_RCInput; delete g_RCInput;
g_RCInput = NULL; g_RCInput = NULL;
//fan speed //fan speed
if (g_info.hw_caps->has_fan) { if (g_info.hw_caps->has_fan)
CFanControlNotifier::setSpeed(0); CFanControlNotifier::setSpeed(0);
}
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT)); //CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
delete CVFD::getInstance(); delete CVFD::getInstance();
delete SHTDCNT::getInstance(); delete SHTDCNT::getInstance();
@@ -3791,9 +3801,6 @@ void CNeutrinoApp::ExitRun(int can_shutdown)
#else #else
exit(can_shutdown); exit(can_shutdown);
#endif #endif
#if 0
}
#endif
} }
void CNeutrinoApp::saveEpg(bool cvfd_mode) void CNeutrinoApp::saveEpg(bool cvfd_mode)