The settings mutexes get used recursively, and deadlock if they are normal mutexes.

llvm-svn: 113309
This commit is contained in:
Jim Ingham 2010-09-07 23:31:30 +00:00
parent 366a94822b
commit a767c9a3ae
1 changed files with 2 additions and 2 deletions

View File

@ -26,8 +26,8 @@ UserSettingsController::UserSettingsController (const char *level_name,
m_pending_settings (),
m_live_settings (),
m_children_mutex (Mutex::eMutexTypeNormal),
m_pending_settings_mutex (Mutex::eMutexTypeNormal),
m_live_settings_mutex (Mutex::eMutexTypeNormal)
m_pending_settings_mutex (Mutex::eMutexTypeRecursive),
m_live_settings_mutex (Mutex::eMutexTypeRecursive)
{
m_settings.parent = parent;
m_settings.level_name.SetCString (level_name);