From e75bf65ab98a683c63a77ab77bb4cc8f6eb41ffe Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 22 Jun 2017 13:56:16 +0200 Subject: [PATCH] pushes now only restart when stream is truly active --- src/controller/controller_push.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controller/controller_push.cpp b/src/controller/controller_push.cpp index 0ee76712..4ecb034a 100644 --- a/src/controller/controller_push.cpp +++ b/src/controller/controller_push.cpp @@ -133,7 +133,7 @@ namespace Controller{ std::string streamname = jt->first; std::string target = (*it)[1u]; 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)){ waitingPushes[streamname].erase(target); if (!waitingPushes[streamname].size()){waitingPushes.erase(streamname);}