luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-28 03:45:24 +01:00
Code Activity

Fix game minetest.conf default settings

Browse Source 
This was a regression introduced by f6e4c5d9cf .
This commit is contained in:
est31
2015-03-13 04:35:34 +01:00
committed by ShadowNinja
parent 467fc0ddc9
commit 538036d004
6 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/settings.cpp
View File

@@ -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)
{