From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 22 Feb 2018 15:32:46 +0000 (+0100)
Subject: DVR: tiny optimization for dvr_entry_class_disp_extratext_set()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f7e2703d1e331d7c75366f7dbeb971c375b97a9;p=thirdparty%2Ftvheadend.git

DVR: tiny optimization for dvr_entry_class_disp_extratext_set()
---

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index d8cf59051..302a42a9d 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -3224,9 +3224,9 @@ dvr_entry_class_disp_extratext_get(void *o)
   prop_ptr = NULL;
   if (de->de_subtitle)
     prop_ptr = lang_str_get(de->de_subtitle, idnode_lang(o));
-  if (prop_ptr == NULL || prop_ptr[0] == '\0')
+  if (prop_ptr == NULL)
     prop_ptr = lang_str_get(de->de_summary, idnode_lang(o));
-  if (prop_ptr == NULL || prop_ptr[0] == '\0')
+  if (prop_ptr == NULL)
     prop_ptr = lang_str_get(de->de_desc, idnode_lang(o));
   if (prop_ptr == NULL)
     prop_ptr = "";
@@ -3240,15 +3240,12 @@ dvr_entry_class_disp_extratext_set(void *o, const void *v)
   const char *lang = idnode_lang(o);
   v = tvh_str_default(v, "?????");
 
-  if (de->de_subtitle && lang_str_get(de->de_subtitle, lang)[0] != '\0'){
+  if (lang_str_get(de->de_subtitle, lang))
     return lang_str_set(&de->de_subtitle, v, lang);
-  }
-  if (de->de_summary && lang_str_get(de->de_summary, lang)[0] != '\0'){
+  if (lang_str_get(de->de_summary, lang))
     return lang_str_set(&de->de_summary, v, lang);
-  }
-  if (de->de_desc && lang_str_get(de->de_desc, lang)[0] != '\0'){
+  if (lang_str_get(de->de_desc, lang))
     return lang_str_set(&de->de_desc, v, lang);
-  }
   // If subtitle, summary or descripcion is not set, the extratext
   // field is stored in subtitle by default
   return lang_str_set(&de->de_subtitle, v, lang);