]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
DVR: Move freeing of some variables to dvr_entry_dec_ref()
authorJaroslav Kysela <perex@perex.cz>
Wed, 19 Nov 2014 12:50:54 +0000 (13:50 +0100)
committerJaroslav Kysela <perex@perex.cz>
Wed, 19 Nov 2014 12:50:54 +0000 (13:50 +0100)
src/dvr/dvr_db.c

index 926535ac00f4d7898fca3d4ac1145ac65efe0182..7ed7e016a7228d196a6ee68ddea1da2141cf0e22 100644 (file)
@@ -642,6 +642,8 @@ dvr_entry_dec_ref(dvr_entry_t *de)
   if (de->de_title) lang_str_destroy(de->de_title);
   if (de->de_desc)  lang_str_destroy(de->de_desc);
   if (de->de_bcast) de->de_bcast->putref((epg_object_t*)de->de_bcast);
+  free(de->de_channel_name);
+  free(de->de_episode);
 
   free(de);
 }
@@ -670,10 +672,6 @@ dvr_entry_destroy(dvr_entry_t *de, int delconf)
     LIST_REMOVE(de, de_channel_link);
   LIST_REMOVE(de, de_global_link);
   de->de_channel = NULL;
-  free(de->de_channel_name);
-  de->de_channel_name = NULL;
-  free(de->de_episode);
-  de->de_episode = NULL;
 
   dvr_entry_dec_ref(de);
 }