htsp server: fix the wrong htsmsg destroy introduced in the imagecache patch, fixes...

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 5a6d794dfe0bea72f84b116d944f90d08bf64214..34772e7a408ecacd0975be40d03f40933901a962 100644 (file)
--- 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 7840400f7600718136e749579ab632a1671f6fb6..a24559c2fe6fc3526bae5684e57aa64d73716115 100644 (file)
--- 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__);
     }