Removed accidentally checked in files

[casparcg] / common / env.cpp

diff --git a/common/env.cpp b/common/env.cpp
index 6e45a813860ecfa1b4a838941846bebae986dc8b..db8429fde792cb80f9007ea1373f6a7e43ccc4e2 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -70,7 +70,7 @@ 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"font-path", initialPath + L"/fonts/");
+               font            = paths.get(L"fonts-path", initialPath + L"/fonts/");
                thumbnails      = paths.get(L"thumbnails-path", initialPath + L"/data/");
        }
        catch(...)
@@ -218,9 +218,4 @@ const boost::property_tree::wptree& properties()
        return pt;
 }
 
-std::wstring system_font_folder()
-{
-       return L"C:\\windows\\Fonts\\";
-}
-
 }}