hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-01-15 13:38:30 +01:00
commit 3484e41270
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/stream.cpp
View file

@ -315,6 +315,9 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
FAIL_MSG("Forking process for stream %s failed: %s", streamname.c_str(), strerror(errno)); FAIL_MSG("Forking process for stream %s failed: %s", streamname.c_str(), strerror(errno));
return false; return false;
} }
if (filename.substr(0, 21) == "push://INTERNAL_ONLY:"){
Util::Procs::remember(pid);
}
}else{ }else{
DEBUG_MSG(DLVL_DONTEVEN, "Not forking"); DEBUG_MSG(DLVL_DONTEVEN, "Not forking");
} }