2.0.2: Fixed problem with comments in xml configuration. Added automatic whitespace...

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 99cf775bb9571fd6a65baeb117a6136ee8dd8ac4..a47ae22fe0eaf04a995f677b0eff8a8228a70f8c 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -56,7 +56,7 @@ void configure(const std::string& filename)
        {\r
                std::string initialPath = boost::filesystem::initial_path().file_string();\r
        \r
-               boost::property_tree::read_xml(initialPath + "\\" + filename, pt);\r
+               boost::property_tree::read_xml(initialPath + "\\" + filename, pt, boost::property_tree::xml_parser::trim_whitespace | boost::property_tree::xml_parser::no_comments);\r
 \r
                auto paths = pt.get_child("configuration.paths");\r
                media = widen(paths.get("media-path", initialPath + "\\media\\"));\r
@@ -97,7 +97,7 @@ const std::wstring& data_folder()
 \r
 const std::wstring& version()\r
 {\r
-       static std::wstring ver = std::wstring(L"") + CASPAR_GEN + L"." + CASPAR_MAYOR + L"." + CASPAR_MINOR + L"." + CASPAR_REV + L" ALPHA";\r
+       static std::wstring ver = std::wstring(L"") + CASPAR_GEN + L"." + CASPAR_MAYOR + L"." + CASPAR_MINOR + L"." + CASPAR_REV + L" " + CASPAR_TAG;\r
        return ver;\r
 }\r
 \r