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 2019-03-06 10:30:37 +01:00
commit 1c85b7b879
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/controller/controller_storage.cpp
View file

@ -331,6 +331,7 @@ namespace Controller{
void writeConfig(){ void writeConfig(){
writeProtocols(); writeProtocols();
jsonForEach(Storage["streams"], it){ jsonForEach(Storage["streams"], it){
it->removeNullMembers();
writeStream(it.key(), *it); writeStream(it.key(), *it);
} }

1
src/controller/controller_streams.cpp
View file

@ -45,6 +45,7 @@ namespace Controller {
std::string prevState = data["error"].asStringRef(); std::string prevState = data["error"].asStringRef();
data["online"] = (std::string)"Checking..."; data["online"] = (std::string)"Checking...";
data.removeMember("error"); data.removeMember("error");
data.removeNullMembers();
switch (Util::getStreamStatus(name)){ switch (Util::getStreamStatus(name)){
case STRMSTAT_OFF: case STRMSTAT_OFF:
//Do nothing //Do nothing