From 8bd35fa8b369fe3ce4a77a8c6de4b23485ecc134 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() Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/7649ac8d5ac6a39362da2a69f34af9d3599af3da Author: vanhofen Date: 2017-11-20 (Mon, 20 Nov 2017) Origin message was: ------------------ - neutrino: more small cleanups in ExitRun() --- src/neutrino.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index a9767e207..e1a7a2609 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4043,6 +4043,10 @@ void CNeutrinoApp::ExitRun(int can_shutdown) stop_lcd4l_support(); //NI lcd4l-support + //NI InfoIcons + if(g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_POPUP) + InfoIcons->saveIconstate(); + if(SDTreloadChannels) SDT_ReloadChannels(); @@ -4073,24 +4077,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"); - //NI InfoIcons - if(g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_POPUP) - InfoIcons->saveIconstate(); + 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