Merge branch 'maint'

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index e0a455d223f9822bdb4c366915661514f64b7543..6786eeef069921ae78118540af58501d7dbbad99 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -937,6 +937,7 @@ static void close_stat_pipe(void)
        stat_task->length_seconds = 0;
        stat_task->offset_seconds = 0;
        stat_task->vss_status = 0;
+       stat_task->current_audio_format_num = -1;
        audiod_status_dump();
 }
 
@@ -1207,6 +1208,8 @@ int main(int argc, char *argv[])
        daemon_set_flag(DF_LOG_TIME);
        daemon_set_flag(DF_LOG_HOSTNAME);
        daemon_set_flag(DF_LOG_LL);
+       if (conf.log_timing_given)
+               daemon_set_flag(DF_LOG_TIMING);
        if (conf.logfile_given) {
                daemon_set_logfile(conf.logfile_arg);
                daemon_open_log_or_die();