2.0.0.2: Display flash version in main window.

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 3ba7c817b242c86a44a93007651e9ded184f5bb1..923e4669b9237a07221f2c1fc3b36a7e6b73e432 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -4,7 +4,7 @@
 \r
 #include "../version.h"\r
 \r
-#include "utility/string_convert.h"\r
+#include "utility/string.h"\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
 #include <boost/property_tree/xml_parser.hpp>\r
@@ -33,7 +33,7 @@ void env::initialize(const std::string& filename)
        media = widen(paths.get("media-path", initialPath + "\\media\\"));\r
        log = widen(paths.get("log-path", initialPath + "\\log\\"));\r
        ftemplate = widen(paths.get("template-path", initialPath + "\\template\\"));\r
-       ftemplate_host = widen(paths.get("template-host-path", initialPath + "\\template\\cg.fth"));\r
+       ftemplate_host = ftemplate + L"\\" + widen(paths.get("template-host", "cg.fth"));\r
        data = widen(paths.get("data-path", initialPath + "\\data\\"));\r
 }\r
        \r