From f00ae42c32efd6fd94faf4c592dea4e540f64e15 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Fri, 18 Apr 2014 13:29:50 +0200
Subject: [PATCH] Fixed default values for cut and DVR time stream settings.

---
 src/controller/controller_streams.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp
index ed1f370f..bfc37559 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -262,8 +262,12 @@ namespace Controller {
           out[jit->first].null();
           out[jit->first]["name"] = jit->first;
           out[jit->first]["source"] = jit->second["source"];
-          out[jit->first]["DVR"] = jit->second["DVR"].asInt();
-          out[jit->first]["cut"] = jit->second["cut"].asInt();
+          if (jit->second.isMember("DVR")){
+            out[jit->first]["DVR"] = jit->second["DVR"].asInt();
+          }
+          if (jit->second.isMember("cut")){
+            out[jit->first]["cut"] = jit->second["cut"].asInt();
+          }
           out[jit->first]["updated"] = 1ll;
           Log("STRM", std::string("Updated stream ") + jit->first);
           if (out[jit->first]["source"].asStringRef().substr(0, 7) != "push://"){
@@ -278,8 +282,12 @@ namespace Controller {
       }else{
         out[jit->first]["name"] = jit->first;
         out[jit->first]["source"] = jit->second["source"];
-        out[jit->first]["DVR"] = jit->second["DVR"].asInt();
-        out[jit->first]["cut"] = jit->second["cut"].asInt();
+        if (jit->second.isMember("DVR")){
+          out[jit->first]["DVR"] = jit->second["DVR"].asInt();
+        }
+        if (jit->second.isMember("cut")){
+          out[jit->first]["cut"] = jit->second["cut"].asInt();
+        }
         Log("STRM", std::string("New stream ") + jit->first);
         startStream(jit->first, out[jit->first]);
       }