edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for graphics thread's current execution to end before triggering the assert dialog

Browse source
This commit is contained in:
Jupeyy 2023-05-27 09:23:59 +02:00
parent 144bb1dd7f
commit ad40156a3b
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client/backend_sdl.cpp
View file

@ -777,7 +777,9 @@ void CGraphicsBackend_SDL_GL::ClampDriverVersion(EBackendType BackendType)
bool CGraphicsBackend_SDL_GL::ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg) bool CGraphicsBackend_SDL_GL::ShowMessageBox(unsigned Type, const char *pTitle, const char *pMsg)
{ {
if(m_pProcessor != nullptr) if(m_pProcessor != nullptr)
{
m_pProcessor->ErroneousCleanup(); m_pProcessor->ErroneousCleanup();
}
// TODO: Remove this workaround when https://github.com/libsdl-org/SDL/issues/3750 is // TODO: Remove this workaround when https://github.com/libsdl-org/SDL/issues/3750 is
// fixed and pass the window to SDL_ShowSimpleMessageBox to make the popup modal instead // fixed and pass the window to SDL_ShowSimpleMessageBox to make the popup modal instead
// of destroying the window before opening the popup. // of destroying the window before opening the popup.

1
src/engine/client/graphics_threaded.cpp
View file

@ -3283,6 +3283,7 @@ bool CGraphics_Threaded::ShowMessageBox(unsigned Type, const char *pTitle, const
{ {
if(m_pBackend == nullptr) if(m_pBackend == nullptr)
return false; return false;
m_pBackend->WaitForIdle();
return m_pBackend->ShowMessageBox(Type, pTitle, pMsg); return m_pBackend->ShowMessageBox(Type, pTitle, pMsg);
} }