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

diff --git a/src/settings.cpp b/src/settings.cpp
index 876c63e7b2c1ea57019a35a6b57f91be73f9463b..c1fe41fa33f4bf26ca7b11cb2277121deccdbd32 100644 (file)
--- 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;
 }