From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 26 May 2017 09:14:41 +0000 (+0200)
Subject: tvhlog: fix the duplicate messages, fixes #4399
X-Git-Tag: v4.2.3~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76dbc3e6c4cfa9de94f64bc755e73319e1b8ea77;p=thirdparty%2Ftvheadend.git

tvhlog: fix the duplicate messages, fixes #4399
---

diff --git a/src/tvhlog.c b/src/tvhlog.c
index 693188dfe..a6af03fbf 100644
--- a/src/tvhlog.c
+++ b/src/tvhlog.c
@@ -283,12 +283,6 @@ tvhlog_process
   if (msg->notify && msg->severity < LOG_TRACE) {
     snprintf(buf, sizeof(buf), "%s %s", t, msg->msg);
     comet_mailbox_add_logmsg(buf, msg->severity >= LOG_DEBUG, 0);
-
-    htsmsg_t *m = htsmsg_create_map();
-    htsmsg_add_str(m, "notificationClass", "logmessage");
-    htsmsg_add_str(m, "logtxt", buf);
-    comet_mailbox_add_message(m, msg->severity >= LOG_DEBUG, 0);
-    htsmsg_destroy(m);
   }
 
   /* Console */
diff --git a/src/webui/comet.c b/src/webui/comet.c
index 213047797..8ae35f432 100644
--- a/src/webui/comet.c
+++ b/src/webui/comet.c
@@ -270,10 +270,10 @@ comet_mailbox_poll(http_connection_t *hc, const char *remain, void *opaque)
   cmb->cmb_last_used = 0; /* Make sure we're not flushed out */
   if (http_access_verify(hc, ACCESS_ADMIN)) {
     if (!cmb->cmb_restricted) {
+      cmb->cmb_restricted = 1;
       pthread_mutex_unlock(&comet_mutex);
       comet_mailbox_add_logmsg(tvh_gettext_lang(lang, N_("Restricted log mode (no administrator)")), 0, 0);
       pthread_mutex_lock(&comet_mutex);
-      cmb->cmb_restricted = 1;
     }
   }