[SCM] kodi-pvr-hts/master: HTSPDemuxer: fix m_seekTime race in CHTSPDemuxer::Seek, fixes #188

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 93efea5dc9799e7aa2591060d31b4c594a1d1177
Author: Jaroslav Kysela <perex at perex.cz>
Date:   Sun Jan 31 17:34:51 2016 +0100

    HTSPDemuxer: fix m_seekTime race in CHTSPDemuxer::Seek, fixes #188

diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index 04a723c..40b3e17 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -159,6 +159,7 @@ bool CHTSPDemuxer::Seek
   if (!m_subscription.IsActive())
     return false;
 
+  m_seekTime = 0;
   m_seeking = true;
   if (!m_subscription.SendSeek(time)) {
     m_seeking = false;
@@ -167,7 +168,6 @@ bool CHTSPDemuxer::Seek
 
   /* Wait for time */
   CLockObject lock(m_conn.Mutex());
-  m_seekTime = 0;
 
   if (!m_seekCond.Wait(m_conn.Mutex(), m_seekTime, Settings::GetInstance().GetResponseTimeout()))
   {

-- 
kodi-pvr-hts packaging