haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lock condition in GL_CONTEXT_MANAGER, remove unnecessary assert. 

Assert handler is already being called from wxCHECK.
This commit is contained in:
Alex Shvartzkop 2023-06-14 07:45:34 +03:00
parent fd669773b6
commit dfb05c4f4b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/gl_context_mgr.cpp
View File

@ -87,8 +87,7 @@ void GL_CONTEXT_MANAGER::DeleteAll()
void GL_CONTEXT_MANAGER::LockCtx( wxGLContext* aContext, wxGLCanvas* aCanvas ) void GL_CONTEXT_MANAGER::LockCtx( wxGLContext* aContext, wxGLCanvas* aCanvas )
{ {
assert( aContext ); wxCHECK( aContext && m_glContexts.count( aContext ) > 0, /* void */ );
wxCHECK( aContext && ( aCanvas || m_glContexts.count( aContext ) > 0 ), /* void */ );
m_glCtxMutex.lock(); m_glCtxMutex.lock();
wxGLCanvas* canvas = aCanvas ? aCanvas : m_glContexts.at( aContext ); wxGLCanvas* canvas = aCanvas ? aCanvas : m_glContexts.at( aContext );
@ -107,7 +106,6 @@ void GL_CONTEXT_MANAGER::LockCtx( wxGLContext* aContext, wxGLCanvas* aCanvas )
void GL_CONTEXT_MANAGER::UnlockCtx( wxGLContext* aContext ) void GL_CONTEXT_MANAGER::UnlockCtx( wxGLContext* aContext )
{ {
assert( aContext );
wxCHECK( aContext && m_glContexts.count( aContext ) > 0, /* void */ ); wxCHECK( aContext && m_glContexts.count( aContext ) > 0, /* void */ );
if( m_glCtx == aContext ) if( m_glCtx == aContext )