From 1ad37d2f722028ed0253a05f73cc0b9efc57cae9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 20 Nov 2017 15:19:06 +0100 Subject: [PATCH] neutrino: more small cleanups in ExitRun() Conflicts: src/neutrino.cpp Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c95d5118eff02a87a2db8f54bd7526e7f73d5de1 Author: vanhofen Date: 2017-11-20 (Mon, 20 Nov 2017) Origin message was: ------------------ - neutrino: more small cleanups in ExitRun() Conflicts: src/neutrino.cpp Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/neutrino.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 6a7e0db00..1c479157b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3842,20 +3842,14 @@ void CNeutrinoApp::ExitRun(int can_shutdown) g_settings.shutdown_timer_record_type = timer_is_rec; saveSetup(NEUTRINO_SETTINGS_FILE); -#if 0 - if (can_shutdown) - { -#endif - puts("[neutrino.cpp] executing " NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT "."); - if (my_system(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT) != 0) - perror(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT " failed"); + puts("[neutrino.cpp] executing " NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT "."); + if (my_system(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT) != 0) + perror(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT " failed"); + + printf("entering off state\n"); + printf("timer_minutes: %ld\n", timer_minutes); + mode = NeutrinoModes::mode_off; - printf("entering off state\n"); - printf("timer_minutes: %ld\n", timer_minutes); - mode = NeutrinoModes::mode_off; -#if 0 - } -#endif int leds = 0; int bright = 0; #if HAVE_COOL_HARDWARE