From cfbc882641f499e226f3d96c5c5dfdac4f108b97 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 30 Apr 2014 11:39:47 +0200
Subject: [PATCH] Various HTTP Dynamic Streaming fixes.

---
 src/output/output.cpp     | 10 ++++++----
 src/output/output_hds.cpp |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/output/output.cpp b/src/output/output.cpp
index d40d5ad5..c7b3a96e 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -54,11 +54,13 @@ namespace Mist {
   }
 
   void Output::updateMeta(){
-    unsigned int i = 0;
     //read metadata from page to myMeta variable
-    JSON::Value jsonMeta;
-    JSON::fromDTMI((const unsigned char*)streamIndex.mapped + 8, streamIndex.len - 8, i, jsonMeta);
-    myMeta = DTSC::Meta(jsonMeta);
+    if (streamIndex.mapped){
+      JSON::Value jsonMeta;
+      unsigned int i = 0;
+      JSON::fromDTMI((const unsigned char*)streamIndex.mapped + 8, streamIndex.len - 8, i, jsonMeta);
+      myMeta = DTSC::Meta(jsonMeta);
+    }
   }
   
   /// Called when stream initialization has failed.
diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp
index 43d129d0..e3e7c38a 100644
--- a/src/output/output_hds.cpp
+++ b/src/output/output_hds.cpp
@@ -162,6 +162,7 @@ namespace Mist {
       if (HTTP_R.url.find(".abst") != std::string::npos){
         myConn.setHost(HTTP_R.GetHeader("X-Origin"));
         streamName = HTTP_R.GetHeader("X-Stream");
+        initialize();
         std::string streamID = HTTP_R.url.substr(streamName.size() + 10);
         streamID = streamID.substr(0, streamID.find(".abst"));
         HTTP_S.Clean();