zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert r7908 because it introduces a race on dabuf

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7928 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-08 22:49:39 +00:00 committed by Christoph Oelckers
parent 0f5f35aa85
commit ea79d74953
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/build/src/sdlayer.cpp
View file

@ -726,11 +726,10 @@ void initputs(const char *buf)
OSD_Puts(buf); OSD_Puts(buf);
// Bprintf("%s", buf); // Bprintf("%s", buf);
mutex_lock(&m_initprintf);
if (Bstrlen(dabuf) + Bstrlen(buf) > 1022) if (Bstrlen(dabuf) + Bstrlen(buf) > 1022)
{ {
mutex_lock(&m_initprintf);
startwin_puts(dabuf); startwin_puts(dabuf);
mutex_unlock(&m_initprintf);
Bmemset(dabuf, 0, sizeof(dabuf)); Bmemset(dabuf, 0, sizeof(dabuf));
} }
@ -738,9 +737,7 @@ void initputs(const char *buf)
if (g_logFlushWindow || Bstrlen(dabuf) > 768) if (g_logFlushWindow || Bstrlen(dabuf) > 768)
{ {
mutex_lock(&m_initprintf);
startwin_puts(dabuf); startwin_puts(dabuf);
mutex_unlock(&m_initprintf);
#ifndef _WIN32 #ifndef _WIN32
startwin_idle(NULL); startwin_idle(NULL);
#else #else
@ -748,6 +745,7 @@ void initputs(const char *buf)
#endif #endif
Bmemset(dabuf, 0, sizeof(dabuf)); Bmemset(dabuf, 0, sizeof(dabuf));
} }
mutex_unlock(&m_initprintf);
} }
// //