[flash] Fixed bug where template-host copying didn't work.

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index db8429fde792cb80f9007ea1373f6a7e43ccc4e2..e7b78298cee97a81dd9286bab52f88af9980b7bd 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -70,8 +70,8 @@ void configure(const std::wstring& filename)
                log                     = paths.get(L"log-path", initialPath + L"/log/");
                ftemplate       = boost::filesystem::complete(paths.get(L"template-path", initialPath + L"/template/")).wstring();
                data            = paths.get(L"data-path", initialPath + L"/data/");
-               font            = paths.get(L"fonts-path", initialPath + L"/fonts/");
-               thumbnails      = paths.get(L"thumbnails-path", initialPath + L"/data/");
+               font            = paths.get(L"font-path", initialPath + L"/font/");
+               thumbnails      = paths.get(L"thumbnail-path", initialPath + L"/thumbnail/");
        }
        catch(...)
        {
@@ -140,7 +140,7 @@ void configure(const std::wstring& filename)
                                if(it->path().wstring().find(L".fth") != std::wstring::npos)
                                {
                                        auto from_path = *it;
-                                       auto to_path = boost::filesystem::path(ftemplate + L"/" + it->path().wstring());
+                                       auto to_path = boost::filesystem::path(ftemplate + L"/" + it->path().filename().wstring());
 
                                        if(boost::filesystem::exists(to_path))
                                                boost::filesystem::remove(to_path);