From a8a27b4403a391d49a953a85dc5cf3aa194a1f8e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 20 Nov 2017 23:22:43 +0100 Subject: [PATCH] neutrino: unify console-output for different conditions in ExitRun() Signed-off-by: Thilo Graf Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/14fafa30598efc28b71f3056458169aa2119665c Author: vanhofen Date: 2017-11-20 (Mon, 20 Nov 2017) Origin message was: ------------------ - neutrino: unify console-output for different conditions in ExitRun() Signed-off-by: Thilo Graf --- src/neutrino.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 210c61a5b..4b0c1a683 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3879,17 +3879,18 @@ void CNeutrinoApp::ExitRun(int can_shutdown) #endif if (timer_minutes || leds) { + time_t t = timer_minutes * 60; + struct tm *tm = localtime(&t); + char date[30]; + strftime(date, sizeof(date), "%c", tm); + printf("timer_wakeup: %s (%ld)\n", date, timer_minutes * 60); + /* prioritize proc filesystem */ if (access("/proc/stb/fp/wakeup_time", F_OK) == 0) { FILE *f = fopen("/proc/stb/fp/wakeup_time","w"); if (f) { - time_t t = timer_minutes * 60; - struct tm *tm = localtime(&t); - char date[30]; - strftime(date, sizeof(date), "%c", tm); - fprintf(stderr, "timer_wakeup: %s (%ld)\n", date, timer_minutes * 60); fprintf(f, "%ld\n", timer_minutes * 60); fclose(f); } @@ -3902,7 +3903,6 @@ void CNeutrinoApp::ExitRun(int can_shutdown) FILE *f = fopen("/tmp/.timer", "w"); if (f) { - fprintf(stderr, "timer_wakeup: %ld\n", timer_minutes * 60); fprintf(f, "%ld\n", timer_minutes * 60); fprintf(f, "%d\n", leds); fprintf(f, "%d\n", bright);