- 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, 5 insertions, 0 deletions

diff --git a/live.h b/live.h
index ac1188b..eba7108 100644
--- a/live.h
+++ b/live.h
@@ -2,6 +2,7 @@
 #define VDR_LIVE_LIVE_H
 
 #include <memory>
+#include <string>
 #include <vdr/plugin.h>
 #include "thread.h"
 
@@ -40,10 +41,14 @@ public:
 	virtual Setup& GetLiveSetup();
 	virtual TimerManager& GetLiveTimerManager();
 
+	static std::string const& GetConfigDirectory() { return m_configDirectory; }
+
 private:
 	static const char *VERSION;
 	static const char *DESCRIPTION;
 
+	static std::string m_configDirectory;
+
 	std::auto_ptr< ServerThread > m_thread;
 };