From 538036d004f914f31c276090d7735d61139fc58e Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Fri, 13 Mar 2015 04:35:34 +0100
Subject: Fix game minetest.conf default settings

This was a regression introduced by f6e4c5d9cf459e8278a76a2beaee59732e841458 .
---
 src/settings.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/settings.cpp')

diff --git a/src/settings.cpp b/src/settings.cpp
index 594b8944d..c1d70714f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -887,6 +887,11 @@ void Settings::clear()
 	clearNoLock();
 }
 
+void Settings::clearDefaults()
+{
+	JMutexAutoLock lock(m_mutex);
+	clearDefaultsNoLock();
+}
 
 void Settings::updateValue(const Settings &other, const std::string &name)
 {
@@ -958,11 +963,18 @@ void Settings::clearNoLock()
 		delete it->second.group;
 	m_settings.clear();
 
+	clearDefaultsNoLock();
+}
+
+void Settings::clearDefaultsNoLock()
+{
+	std::map<std::string, SettingsEntry>::const_iterator it;
 	for (it = m_defaults.begin(); it != m_defaults.end(); ++it)
 		delete it->second.group;
 	m_defaults.clear();
 }
 
+
 void Settings::registerChangedCallback(std::string name,
 	setting_changed_callback cbf, void *userdata)
 {
-- 
cgit v1.2.3