diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index ee15326..caa868d 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2499,18 +2499,19 @@ TIMER_START();
    long timerd_signal = 0;
    timer_wakeup = false;//init
    wake_up( timer_wakeup );
+   timer_wakeup = (timer_wakeup && g_settings.shutdown_timer_record_type);
+   g_settings.shutdown_timer_record_type = false;

    init_cec_setting = true;
-   if(!(g_settings.shutdown_timer_record_type && timer_wakeup && g_settings.hdmi_cec_mode)){
+   if(!(timer_wakeup && g_settings.hdmi_cec_mode))
+   {
        //init cec settings
        CCECSetup cecsetup;
        cecsetup.setCECSettings();
        init_cec_setting = false;
    }
-   timer_wakeup = (timer_wakeup && g_settings.shutdown_timer_record_type);
-   g_settings.shutdown_timer_record_type = false;

-   timerd_signal = (timer_wakeup && g_settings.shutdown_timer_record_type);
+   timerd_signal = timer_wakeup;
    pthread_create (&timer_thread, NULL, timerd_main_thread, (void *)&timerd_signal);
    timerd_thread_started = true;

@@ -4132,7 +4133,7 @@ void CNeutrinoApp::ExitRun(int exit_code)
            struct tm *tm = localtime(&t);
            char date[30];
            strftime(date, sizeof(date), "%c", tm);
-           printf("timer_wakeup: %s (%ld)\n", date, timer_minutes * 60);
+           printf("wakeup_time: %s (%ld)\n", date, timer_minutes * 60);

            /* prioritize proc filesystem */
            if (access("/proc/stb/fp/wakeup_time", F_OK) == 0)