[SCM] kodi-pvr-hts/master: demuxer: move m_seeking setup to the right place, fix m_seeking/m_changeSpeed initialization

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

The following commit has been merged in the master branch:
commit 028aad6262223e422bdac33b2fee309f37699a28
Author: Jaroslav Kysela <perex at perex.cz>
Date:   Sat Dec 19 21:01:32 2015 +0100

    demuxer: move m_seeking setup to the right place, fix m_seeking/m_changeSpeed initialization

diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index 6ec6d07..7569b0b 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -34,7 +34,8 @@ using namespace tvheadend::utilities;
 CHTSPDemuxer::CHTSPDemuxer ( CHTSPConnection &conn )
   : m_conn(conn), m_pktBuffer((size_t)-1),
     m_seekTime(INVALID_SEEKTIME),
-    m_subscription(conn)
+    m_subscription(conn),
+    m_seeking(false), m_speedChange(false)
 {
   m_lastUse = 0;
 }
@@ -78,6 +79,8 @@ void CHTSPDemuxer::Abort0 ( void )
   CLockObject lock(m_mutex);
   m_streams.Clear();
   m_streamStat.clear();
+  m_seeking = false;
+  m_speedChange = false;
 }
 
 
@@ -159,10 +162,11 @@ bool CHTSPDemuxer::Seek
   if (!m_subscription.IsActive())
     return false;
 
-  if (!m_subscription.SendSeek(time))
-    return false;
-
   m_seeking = true;
+  if (!m_subscription.SendSeek(time)) {
+    m_seeking = false;
+    return false;
+  }
 
   /* Wait for time */
   m_seekTime = 0;

-- 
kodi-pvr-hts packaging