tvheadend addon: fix CHTSPData::GetEvent(). lock the mutex while gett…

…ing a new sequence number.
opdenkamp · May 6, 2011 · 2b789bc · 2b789bc
1 parent bdd964d
commit 2b789bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/xbmc/pvrclients/tvheadend/HTSPConnection.cpp b/xbmc/pvrclients/tvheadend/HTSPConnection.cpp
@@ -182,8 +182,12 @@ bool CHTSPConnection::SendMessage(htsmsg_t* m)
 
 htsmsg_t* CHTSPConnection::ReadResult(htsmsg_t* m, bool sequence)
 {
+  uint32_t iSequence = 0;
   if(sequence)
-    htsmsg_add_u32(m, "seq", ++m_iSequence);
+  {
+    iSequence = AddSequence();
+    htsmsg_add_u32(m, "seq", iSequence);
+  }
 
   if(!SendMessage(m))
     return NULL;
@@ -196,7 +200,7 @@ htsmsg_t* CHTSPConnection::ReadResult(htsmsg_t* m, bool sequence)
     uint32_t seq;
     if(!sequence)
       break;
-    if(!htsmsg_get_u32(m, "seq", &seq) && seq == m_iSequence)
+    if(!htsmsg_get_u32(m, "seq", &seq) && seq == iSequence)
       break;
 
     queue.push_back(m);

diff --git a/xbmc/pvrclients/tvheadend/HTSPData.cpp b/xbmc/pvrclients/tvheadend/HTSPData.cpp
@@ -680,7 +680,7 @@ bool CHTSPData::GetEvent(SEvent& event, uint32_t id)
   htsmsg_t *msg = htsmsg_create_map();
   htsmsg_add_str(msg, "method", "getEvent");
   htsmsg_add_u32(msg, "eventId", id);
-  if((msg = m_session->ReadResult(msg, true)) == NULL)
+  if((msg = ReadResult(msg)) == NULL)
   {
     XBMC->Log(LOG_DEBUG, "%s - failed to get event %d", __FUNCTION__, id);
     return false;