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-03-20 16:34:29 +01:00
commit 062d299c44
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/stream.cpp
View file

@ -138,8 +138,15 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
//Note: this uses the _whole_ stream name, including + (if any). //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. //This means "test+a" and "test+b" have separate locks and do not interact with each other.
if (streamAlive(streamname)){ if (streamAlive(streamname)){
DEBUG_MSG(DLVL_MEDIUM, "Stream %s already active; continuing", streamname.c_str()); uint8_t streamStat = getStreamStatus(streamname);
return true; while (streamStat == STRMSTAT_SHUTDOWN){
Util::sleep(250);
streamStat = getStreamStatus(streamname);
}
if (streamStat != STRMSTAT_OFF){
DEBUG_MSG(DLVL_MEDIUM, "Stream %s already active; continuing", streamname.c_str());
return true;
}
} }
//Attempt to load up configuration and find this stream //Attempt to load up configuration and find this stream