do not wait for 'subscriptionChangeWeight' response

kodi-pvr · Jul 26, 2015 · 8b2cea2 · 8b2cea2
1 parent e083c39
commit 8b2cea2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/HTSPConnection.cpp b/src/HTSPConnection.cpp
@@ -327,8 +327,14 @@ htsmsg_t *CHTSPConnection::SendAndWait0 ( const char *method, htsmsg_t *msg, int
   }
 
   /* Wait for response */
-  msg = resp.Get(m_mutex, iResponseTimeout);
+  msg = resp.Get(m_mutex, iResponseTimeout > 0 ? iResponseTimeout : 1);
   m_messages.erase(seq);
+
+  /* No response needed */
+  if (!iResponseTimeout && !msg)
+    return NULL;
+
+  /* No response received */
   if (!msg)
   {
     //XBMC->QueueNotification(QUEUE_ERROR, "Command %s failed: No response received", method);

diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
@@ -358,8 +358,9 @@ void CHTSPDemuxer::SendWeight ( void )
   htsmsg_add_s32(m, "weight",         m_subscription.weight);
   tvhdebug("demux send weight %u", m_subscription.weight);
 
-  /* Send and Wait */
-  m = m_conn.SendAndWait("subscriptionChangeWeight", m);
+  /* Send and don't wait for a response (timeout to 0)                */
+  /* This because tvh doesn't seems to respond for dead subscriptions */
+  m = m_conn.SendAndWait("subscriptionChangeWeight", m, 0);
   if (m)
     htsmsg_destroy(m);
 }