From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 14 Dec 2018 10:27:45 +0000 (+0100)
Subject: htsp server: fix the wrong htsmsg destroy introduced in the imagecache patch, fixes... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abfc7c92d5151046bd47e0b36dc67797158bd6b8;p=thirdparty%2Ftvheadend.git

htsp server: fix the wrong htsmsg destroy introduced in the imagecache patch, fixes #5430, fixes #5431, fixes #5429
---

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 5a6d794df..34772e7a4 100644
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -3594,10 +3594,8 @@ htsp_async_send_cb(http_async_send_cb_t cb, int mode, void *aux)
   LIST_FOREACH(htsp, &htsp_async_connections, htsp_async_link)
     if (htsp->htsp_async_mode & mode) {
       m = cb(htsp, aux);
-      if (m != NULL) {
+      if (m != NULL)
         htsp_send_message(htsp, m, NULL);
-        htsmsg_destroy(m);
-      }
     }
 }
 
diff --git a/src/tvh_thread.c b/src/tvh_thread.c
index 7840400f7..a24559c2f 100644
--- a/src/tvh_thread.c
+++ b/src/tvh_thread.c
@@ -500,7 +500,7 @@ static void *tvh_thread_watch_thread(void *aux)
     pthread_mutex_lock(&thrwatch_mutex);
     now = getfastmonoclock();
     mutex = TAILQ_LAST(&thrwatch_mutexes, tvh_mutex_queue);
-    if (mutex && mutex->tstamp + sec2mono(5) < now) {
+    if (mutex && mutex->tstamp + sec2mono(55) < now) {
       pthread_mutex_unlock(&thrwatch_mutex);
       tvh_thread_mutex_failed(mutex, "deadlock", __FILE__, __LINE__);
     }