From 57ef38d35597e3e1e655712b1216f24af082f6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Meerk=C3=B6tter?= Date: Thu, 23 Feb 2012 22:15:22 +0100 Subject: [PATCH 1/2] spelling --- src/streaming.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 src/streaming.c diff --git a/src/streaming.c b/src/streaming.c old mode 100644 new mode 100755 index fde3be29..cb74b054 --- a/src/streaming.c +++ b/src/streaming.c @@ -333,7 +333,7 @@ streaming_code2txt(int code) case SM_CODE_OK: return "OK"; case SM_CODE_SOURCE_RECONFIGURED: - return "Soruce reconfigured"; + return "Source reconfigured"; case SM_CODE_BAD_SOURCE: return "Source quality is bad"; case SM_CODE_SOURCE_DELETED: From f0e4366aa2bf77a0a7db6fada7e326c409cbba73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Meerk=C3=B6tter?= Date: Thu, 23 Feb 2012 22:16:26 +0100 Subject: [PATCH 2/2] fix segfault due to failed mk_mux_create() if mk_mux_create() fails due to to file system permissions tvheadend will crash when trying to remove the rec-entry from the UI. --- src/dvr/dvr_rec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/dvr/dvr_rec.c diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c old mode 100644 new mode 100755 index 6bf667fd..87c28ea7 --- a/src/dvr/dvr_rec.c +++ b/src/dvr/dvr_rec.c @@ -553,8 +553,10 @@ dvr_spawn_postproc(dvr_entry_t *de, const char *dvr_postproc) static void dvr_thread_epilog(dvr_entry_t *de) { - mk_mux_close(de->de_mkmux); - de->de_mkmux = NULL; + if(de->de_mkmux) { + mk_mux_close(de->de_mkmux); + de->de_mkmux = NULL; + } dvr_config_t *cfg = dvr_config_find_by_name_default(de->de_config_name); if(cfg->dvr_postproc)