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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output.cpp
This commit is contained in:
Thulinma 2018-06-12 11:25:59 +02:00
commit ebdaf6e063
2 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/stream.cpp
View file

@ -193,7 +193,7 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
//Note: this uses the _whole_ stream name, including + (if any).
//This means "test+a" and "test+b" have separate locks and do not interact with each other.
uint8_t streamStat = getStreamStatus(streamname);
while (streamStat != STRMSTAT_OFF && streamStat != STRMSTAT_READY){
while (streamStat != STRMSTAT_OFF && streamStat != STRMSTAT_READY && (!isProvider || streamStat != STRMSTAT_WAIT)){
if (streamStat == STRMSTAT_BOOT && overrides.count("throughboot")){
break;
}