prop: tiny optimization for string handling

tvheadend · Apr 15, 2016 · bdde12b · bdde12b
1 parent 0e5fc7c
commit bdde12b
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/prop.c b/src/prop.c
@@ -317,13 +317,9 @@ prop_read_value
       htsmsg_add_s64(m, name, atomic_get_s64((int64_t *)val));
       break;
     case PT_STR:
-      if (optmask & PO_LOCALE) {
-        if ((s = *(const char **)val))
-          htsmsg_add_str(m, name, lang ? tvh_gettext_lang(lang, s) : s);
-      } else {
-        if ((s = *(const char **)val))
-          htsmsg_add_str(m, name, s);
-      }
+      if ((s = *(const char **)val))
+        htsmsg_add_str(m, name, (optmask & PO_LOCALE) != 0 && lang ?
+                                tvh_gettext_lang(lang, s) : s);
       break;
     case PT_DBL:
       htsmsg_add_dbl(m, name, *(double*)val);