From 61e31de98b97f556cfb2a0cafa172bde673e7859 Mon Sep 17 00:00:00 2001 From: Sascha Volkenandt Date: Thu, 4 Jan 2007 17:42:33 +0000 Subject: - removed thread-unsafe call of cPlugin::ConfigDirectory and replaced it with Plugin::GetConfigDirectory - implemented proper shutdown of server thread on vdr termination --- tntconfig.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tntconfig.cpp') diff --git a/tntconfig.cpp b/tntconfig.cpp index 60bfad2..2036a46 100644 --- a/tntconfig.cpp +++ b/tntconfig.cpp @@ -4,6 +4,7 @@ #include #include #include +#include "live.h" #include "setup.h" #include "tntconfig.h" @@ -21,7 +22,7 @@ void TntConfig::WriteConfig() WriteProperties(); ostringstream builder; - builder << cPlugin::ConfigDirectory( PLUGIN_NAME_I18N ) << "/httpd.config"; + builder << Plugin::GetConfigDirectory() << "/httpd.config"; m_configPath = builder.str(); ofstream file( m_configPath.c_str(), ios::out | ios::trunc ); @@ -47,7 +48,7 @@ void TntConfig::WriteConfig() void TntConfig::WriteProperties() { ostringstream builder; - builder << cPlugin::ConfigDirectory( PLUGIN_NAME_I18N ) << "/httpd.properties"; + builder << Plugin::GetConfigDirectory() << "/httpd.properties"; m_propertiesPath = builder.str(); ofstream file( m_propertiesPath.c_str(), ios::out | ios::trunc ); -- cgit v1.2.3