From d5dbb57c8486d09f57abec7adb1c42a8fe8794f8 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Tue, 5 Mar 2019 14:31:43 +0100
Subject: [PATCH] Fixed null members in stream configs causing failures
---
src/controller/controller_storage.cpp | 1 +
src/controller/controller_streams.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/controller/controller_storage.cpp b/src/controller/controller_storage.cpp
index c171b960..477e7b02 100644
--- a/src/controller/controller_storage.cpp
+++ b/src/controller/controller_storage.cpp
@@ -299,6 +299,7 @@ namespace Controller {
void writeConfig(){
writeProtocols();
jsonForEach(Storage["streams"], it){
+ it->removeNullMembers();
writeStream(it.key(), *it);
}
}
diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp
index 137594f4..82c38271 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -42,6 +42,7 @@ namespace Controller {
std::string prevState = data["error"].asStringRef();
data["online"] = (std::string)"Checking...";
data.removeMember("error");
+ data.removeNullMembers();
switch (Util::getStreamStatus(name)){
case STRMSTAT_OFF:
//Do nothing