Merge pull request #57 from fmeerkoetter/fix_crash_invalid_record_dir
fix segfault due to failed mk_mux_create()
This commit is contained in:
commit
612ce06370
2 changed files with 5 additions and 3 deletions
6
src/dvr/dvr_rec.c
Normal file → Executable file
6
src/dvr/dvr_rec.c
Normal file → Executable file
|
@ -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)
|
||||
|
|
2
src/streaming.c
Normal file → Executable file
2
src/streaming.c
Normal file → Executable file
|
@ -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:
|
||||
|
|
Loading…
Add table
Reference in a new issue