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-08-27 14:17:20 +02:00
commit 6ddc4adadf
10 changed files with 65 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/stream.cpp
View file

@ -331,7 +331,7 @@ 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));
return false;
}
if (pid && filename.substr(0, 21) == "push://INTERNAL_ONLY:"){
if (pid && overrides.count("singular")){
Util::Procs::setHandler();
Util::Procs::remember(pid);
}