From: Derek Barnett <derekwbarnett@gmail.com>
Date: Wed, 24 Jul 2013 20:00:39 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/pezmaster31/bamtools
X-Git-Url: https://git.donarmstrong.com/?p=bamtools.git;a=commitdiff_plain;h=9220032eb9f9db7e1226c130757d2d91de35e9e6;hp=e990c5b852c62cd1237919ccc75cd3ea049b915f

Merge branch 'master' of https://github.com/pezmaster31/bamtools
---

diff --git a/src/api/SamHeader.cpp b/src/api/SamHeader.cpp
index 967957a..9221944 100644
--- a/src/api/SamHeader.cpp
+++ b/src/api/SamHeader.cpp
@@ -73,6 +73,7 @@ SamHeader::SamHeader(const SamHeader& other)
     , ReadGroups(other.ReadGroups)
     , Programs(other.Programs)
     , Comments(other.Comments)
+    , m_errorString(other.GetErrorString())
 { }
 
 /*! \fn SamHeader::~SamHeader(void)
diff --git a/src/toolkit/bamtools_convert.cpp b/src/toolkit/bamtools_convert.cpp
index b0aae07..54820e7 100644
--- a/src/toolkit/bamtools_convert.cpp
+++ b/src/toolkit/bamtools_convert.cpp
@@ -423,7 +423,7 @@ void ConvertTool::ConvertToolPrivate::PrintJson(const BamAlignment& a) {
     }
     
     // write alignment's source BAM file
-    m_out << "\"filename\":" << a.Filename << ",";
+    m_out << "\"filename\":\"" << a.Filename << "\",";
 
     // write tag data
     const char* tagData = a.TagData.c_str();