- removed thread-unsafe call of cPlugin::ConfigDirectory and replaced it with Plugin::GetConfigDirectory

- implemented proper shutdown of server thread on vdr termination

1 files changed, 3 insertions, 2 deletions

diff --git a/tntconfig.cpp b/tntconfig.cpp
index 60bfad2..2036a46 100644
--- a/tntconfig.cpp
+++ b/tntconfig.cpp
@@ -4,6 +4,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <vdr/plugin.h>
+#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 );