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

pushes now only restart when stream is truly active

Browse source
This commit is contained in:
Thulinma 2017-06-22 13:56:16 +02:00
parent 0ca63d1440
commit e75bf65ab9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/controller/controller_push.cpp
View file

@ -133,7 +133,7 @@ namespace Controller{
std::string streamname = jt->first; std::string streamname = jt->first;
std::string target = (*it)[1u]; std::string target = (*it)[1u];
if (pStr == streamname || (*pStr.rbegin() == '+' && streamname.substr(0, pStr.size()) == pStr)){ if (pStr == streamname || (*pStr.rbegin() == '+' && streamname.substr(0, pStr.size()) == pStr)){
if (!isPushActive(streamname, target)){ if (!isPushActive(streamname, target) && Util::getStreamStatus(streamname) == STRMSTAT_READY){
if (waitingPushes[streamname][target]++ >= waittime && (curCount < maxspeed || !maxspeed)){ if (waitingPushes[streamname][target]++ >= waittime && (curCount < maxspeed || !maxspeed)){
waitingPushes[streamname].erase(target); waitingPushes[streamname].erase(target);
if (!waitingPushes[streamname].size()){waitingPushes.erase(streamname);} if (!waitingPushes[streamname].size()){waitingPushes.erase(streamname);}