Settings: Prevent mutex deadlock in remove() (#7803)

minetest · Sep 18, 2019 · 4271889 · 4271889
1 parent 94a5df7
commit 4271889
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/settings.cpp b/src/settings.cpp
@@ -908,17 +908,20 @@ bool Settings::setNoiseParams(const std::string &name,
 
 bool Settings::remove(const std::string &name)
 {
-	MutexAutoLock lock(m_mutex);
+	// Lock as short as possible, unlock before doCallbacks()
+	m_mutex.lock();
 
 	SettingEntries::iterator it = m_settings.find(name);
 	if (it != m_settings.end()) {
 		delete it->second.group;
 		m_settings.erase(it);
+		m_mutex.unlock();
 
 		doCallbacks(name);
 		return true;
 	}
 
+	m_mutex.unlock();
 	return false;
 }