diff options
| author | sapier <Sapier at GMX dot net> | 2013-11-30 21:22:15 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2013-11-30 21:22:15 +0100 |
| commit | de0cdbc01cc39e4f89a9d012661031a66ba3294f (patch) | |
| tree | 1d6e4bb56c41cd136028a5df896247225eb54820 /src/jthread/win32 | |
| parent | e605d7025608f8d04cdd6143c6be85e35ef067e3 (diff) | |
| download | minetest-de0cdbc01cc39e4f89a9d012661031a66ba3294f.tar.gz minetest-de0cdbc01cc39e4f89a9d012661031a66ba3294f.tar.bz2 minetest-de0cdbc01cc39e4f89a9d012661031a66ba3294f.zip | |
Fix log threadname lookup handling not beeing threadsafe
Diffstat (limited to 'src/jthread/win32')
| -rw-r--r-- | src/jthread/win32/jmutex.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/jthread/win32/jmutex.cpp b/src/jthread/win32/jmutex.cpp index d079d448d..8a31495cd 100644 --- a/src/jthread/win32/jmutex.cpp +++ b/src/jthread/win32/jmutex.cpp @@ -29,7 +29,14 @@ JMutex::JMutex() { - initialized = false; +#ifdef JMUTEX_CRITICALSECTION + InitializeCriticalSection(&mutex); +#else + mutex = CreateMutex(NULL,FALSE,NULL); + if (mutex == NULL) + return ERR_JMUTEX_CANTCREATEMUTEX; +#endif // JMUTEX_CRITICALSECTION + initialized = true; } JMutex::~JMutex() @@ -44,16 +51,6 @@ JMutex::~JMutex() int JMutex::Init() { - if (initialized) - return ERR_JMUTEX_ALREADYINIT; -#ifdef JMUTEX_CRITICALSECTION - InitializeCriticalSection(&mutex); -#else - mutex = CreateMutex(NULL,FALSE,NULL); - if (mutex == NULL) - return ERR_JMUTEX_CANTCREATEMUTEX; -#endif // JMUTEX_CRITICALSECTION - initialized = true; return 0; } |