- std::map<std::string, std::vector<setting_changed_callback> > m_callbacks;
- // All methods that access m_settings/m_defaults directly should lock this.
- mutable JMutex m_mutex;
+
+ std::map<std::string, std::vector<std::pair<setting_changed_callback,void*> > > m_callbacks;
+
+ mutable Mutex m_callbackMutex;
+ mutable Mutex m_mutex; // All methods that access m_settings/m_defaults directly should lock this.
+