Use single box for halo mesh

[minetest.git] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
index 3d4d56fa3dc5a02b26210ae79f8e521a056d87e8..8ea687d1c8b7cff41c7fb6c6490b3df9bd164477 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -880,8 +880,14 @@ bool Settings::remove(const std::string &name)
 {
        MutexAutoLock lock(m_mutex);
 
-       delete m_settings[name].group;
-       return m_settings.erase(name);
+       std::map<std::string, SettingsEntry>::iterator it = m_settings.find(name);
+       if (it != m_settings.end()) {
+               delete it->second.group;
+               m_settings.erase(it);
+               return true;
+       } else {
+               return false;
+       }
 }
 
 
@@ -1009,7 +1015,7 @@ void Settings::doCallbacks(const std::string name)
        if (iterToVector != m_callbacks.end())
        {
                std::vector<std::pair<setting_changed_callback, void*> >::iterator iter;
-               for (iter = iterToVector->second.begin(); iter != iterToVector->second.end(); iter++)
+               for (iter = iterToVector->second.begin(); iter != iterToVector->second.end(); ++iter)
                {
                        (iter->first)(name, iter->second);
                }