thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Remove hack to avoid issues with OSD messages from other threads

Browse source
This commit is contained in:
Thierry Crozat 2016-10-23 20:04:05 +01:00
parent 0908fd2225
commit cbfa598446
2 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/graphics/opengl/opengl-graphics.cpp
View file

@ -377,7 +377,6 @@ void OpenGLGraphicsManager::updateScreen() {
#ifdef USE_OSD
{
Common::StackLock lock(_osdMutex);
if (_osdMessageChangeRequest) {
osdMessageUpdateSurface();
}
@ -741,11 +740,6 @@ void OpenGLGraphicsManager::setCursorPalette(const byte *colors, uint start, uin
void OpenGLGraphicsManager::displayMessageOnOSD(const char *msg) {
#ifdef USE_OSD
// HACK: Actually no client code should use graphics functions from
// another thread. But the MT-32 emulator and network synchronization still do,
// thus we need to make sure this doesn't happen while a updateScreen call is done.
Common::StackLock lock(_osdMutex);
_osdMessageChangeRequest = true;
_osdMessageNextData = msg;