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

Fixed a few config semaphore locks in Pro edition

Browse source
This commit is contained in:
Thulinma 2017-05-16 15:42:13 +02:00
parent baf5c79436
commit d2b020072c
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

@ -167,6 +167,7 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
} }
/*LTS-START*/ /*LTS-START*/
if (config.getMember("hardlimit_active")) { if (config.getMember("hardlimit_active")) {
configLock.post();//unlock the config semaphore
return false; return false;
} }
/*LTS-END*/ /*LTS-END*/
@ -180,10 +181,12 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
/*LTS-START*/ /*LTS-START*/
if (!filename.size()){ if (!filename.size()){
if (stream_cfg && stream_cfg.getMember("hardlimit_active")) { if (stream_cfg && stream_cfg.getMember("hardlimit_active")) {
configLock.post();//unlock the config semaphore
return false; return false;
} }
if(Triggers::shouldTrigger("STREAM_LOAD", smp)){ if(Triggers::shouldTrigger("STREAM_LOAD", smp)){
if (!Triggers::doTrigger("STREAM_LOAD", streamname, smp)){ if (!Triggers::doTrigger("STREAM_LOAD", streamname, smp)){
configLock.post();//unlock the config semaphore
return false; return false;
} }
} }