[SCM] kodi-pvr-hts/master: fix merge error which causes subscriptionSeek to fail

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

The following commit has been merged in the master branch:
commit 9c524c5e027797d71def2a080a437890ae4b0ba6
Author: Sam Stenvall <sam.stenvall at nordsoftware.com>
Date:   Sun Jan 31 13:41:52 2016 +0200

    fix merge error which causes subscriptionSeek to fail

diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index ec7bc19..1fe4730 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -169,6 +169,8 @@ 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