From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 26 May 2015 06:47:40 +0000 (+0200)
Subject: fix update time settings, fixes #2895
X-Git-Tag: v4.2.1~2462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8f623588f751908606d94c89dbfc2ae710aae4d;p=thirdparty%2Ftvheadend.git

fix update time settings, fixes #2895
---

diff --git a/src/htsmsg.c b/src/htsmsg.c
index c0112a37b..0b7274472 100644
--- a/src/htsmsg.c
+++ b/src/htsmsg.c
@@ -402,6 +402,18 @@ htsmsg_field_get_s64
  *
  */
 
+int
+bool_check(const char *str)
+{
+  if (str &&
+      (!strcmp(str, "yes")  ||
+       !strcmp(str, "true") ||
+       !strcmp(str, "on") ||
+       !strcmp(str, "1")))
+    return 1;
+  return 0;
+}
+
 int
 htsmsg_field_get_bool
   ( htsmsg_field_t *f, int *boolp )
@@ -410,13 +422,7 @@ htsmsg_field_get_bool
   default:
     return HTSMSG_ERR_CONVERSION_IMPOSSIBLE;
   case HMF_STR:
-    if (!strcmp(f->hmf_str, "yes")  ||
-        !strcmp(f->hmf_str, "true") ||
-        !strcmp(f->hmf_str, "on") ||
-        !strcmp(f->hmf_str, "1"))
-      *boolp = 1;
-    else
-      *boolp = 0;
+    *boolp = bool_check(f->hmf_str);
     break;
   case HMF_S64:
     *boolp = f->hmf_s64 ? 1 : 0;
diff --git a/src/htsmsg.h b/src/htsmsg.h
index 993d213db..4b7688308 100644
--- a/src/htsmsg.h
+++ b/src/htsmsg.h
@@ -231,6 +231,8 @@ int htsmsg_field_get_s64(htsmsg_field_t *f, int64_t *s64p);
  */
 int64_t htsmsg_get_s64_or_default(htsmsg_t *msg, const char *name, int64_t def);
 
+int bool_check(const char *str);
+
 int htsmsg_field_get_bool(htsmsg_field_t *f, int *boolp);
 
 int htsmsg_get_bool(htsmsg_t *msg, const char *name, int *boolp);
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 769c8e6c9..64aab9fe7 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -518,9 +518,9 @@ extjs_config(http_connection_t *hc, const char *remain, void *opaque)
 
     /* Time */
     str = http_arg_get(&hc->hc_req_args, "tvhtime_update_enabled");
-    tvhtime_set_update_enabled(!!str);
+    tvhtime_set_update_enabled(bool_check(str));
     str = http_arg_get(&hc->hc_req_args, "tvhtime_ntp_enabled");
-    tvhtime_set_ntp_enabled(!!str);
+    tvhtime_set_ntp_enabled(bool_check(str));
     if ((str = http_arg_get(&hc->hc_req_args, "tvhtime_tolerance")))
       tvhtime_set_tolerance(atoi(str));