From 489ba951501a569042850d6ea0e573a12ceffda7 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 9 Jan 2017 20:36:20 +0100 Subject: [PATCH] timeshift: fix the locking bug introduced by the last commit, simplify code --- src/timeshift/timeshift_writer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/timeshift/timeshift_writer.c b/src/timeshift/timeshift_writer.c index 24fb458f8..102835e32 100644 --- a/src/timeshift/timeshift_writer.c +++ b/src/timeshift/timeshift_writer.c @@ -369,9 +369,8 @@ static void _process_msg } if (sm->sm_type == SMT_START) _update_smt_start(ts, (streaming_start_t *)sm->sm_data); - if (ts->dobuf) { - if (teletext) /* do not save teletext packets */ - goto end; + /* do buffering, but without teletext packets */ + if (ts->dobuf && !teletext) { if ((tsf = timeshift_filemgr_get(ts, sm->sm_time)) != NULL) { if (tsf->wfd >= 0 || tsf->ram) { if ((err = _process_msg0(ts, tsf, sm)) < 0) { @@ -390,7 +389,6 @@ static void _process_msg } /* Next */ -end: streaming_msg_free(sm); return; -- 2.47.2