From 603d4826fd72c9ba4c4ee4b04214b1b073e725d4 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Thu, 20 Oct 2011 11:36:41 +0000
Subject: [PATCH] Fixing thread safety of ConfigFile.

---
 src/config/configfile.cpp | 6 ++++++
 src/config/configfile.h   | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index fb6eb336..5f0ac8e7 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -584,6 +584,12 @@ void ConfigFile::updateConfig(ConfigState myConfigState)
 	}
 }
 
+ConfigState ConfigFile::getConfigState() const
+{
+	boost::recursive_mutex::scoped_lock lock(m_configMutex);
+	return myConfigState;
+}
+
 string ConfigFile::readConfigString(string varName) const
 {
 	boost::recursive_mutex::scoped_lock lock(m_configMutex);
diff --git a/src/config/configfile.h b/src/config/configfile.h
index f48cd20e..6183cd3f 100644
--- a/src/config/configfile.h
+++ b/src/config/configfile.h
@@ -39,9 +39,7 @@ public:
 	void writeBuffer() const;
 
 	void updateConfig(ConfigState);
-	ConfigState getConfigState() const {
-		return myConfigState;
-	}
+	ConfigState getConfigState() const;
 
 	std::string readConfigString(std::string varName) const;
 	std::list<std::string> readConfigStringList(std::string varName) const;