From b359144b7cf975ceeaab724de00a57633dc522f0 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Mon, 4 Feb 2013 15:19:47 +0000 Subject: [PATCH] Fix #1591 - timeshift: fix mutex deadlock affecting on-demand mode. Note: there is still an issue I've realised in that writer_flush() could potentially result in a single packet being written out of order as two threads have the potential to write. This isn't fatal and is probably rare enough to ignore at this stage. --- src/timeshift/timeshift_reader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/timeshift/timeshift_reader.c b/src/timeshift/timeshift_reader.c index d6b11941..2e5d1d2f 100644 --- a/src/timeshift/timeshift_reader.c +++ b/src/timeshift/timeshift_reader.c @@ -777,7 +777,6 @@ void *timeshift_reader ( void *p ) /* Flush unwanted */ } else if (ts->ondemand && cur_file) { pthread_mutex_lock(&ts->rdwr_mutex); - timeshift_writer_flush(ts); timeshift_filemgr_flush(ts, cur_file); pthread_mutex_unlock(&ts->rdwr_mutex); }