TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

prc: fix recursive use of non-recursive mutex

Browse Source
This commit is contained in:
rdb 2019-02-06 22:08:25 +01:00
parent 0ef9f9bef5
commit 666568a513
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtool/src/prc/configVariableBool.cxx
View File

@ -12,6 +12,7 @@
*/ */
#include "configVariableBool.h" #include "configVariableBool.h"
#include "mutexImpl.h"
/** /**
* Refreshes the cached value. * Refreshes the cached value.
@ -21,7 +22,10 @@ reload_value() const {
// NB. MSVC doesn't guarantee that this mutex is initialized in a // NB. MSVC doesn't guarantee that this mutex is initialized in a
// thread-safe manner. But chances are that the first time this is called // thread-safe manner. But chances are that the first time this is called
// is at static init time, when there is no risk of data races. // is at static init time, when there is no risk of data races.
static MutexImpl lock;
// This needs to be a recursive mutex, because get_bool_word() may end up
// indirectly querying another bool config variable.
static ReMutexImpl lock;
lock.lock(); lock.lock();
// We check again for cache validity since another thread may have beaten // We check again for cache validity since another thread may have beaten