Kaydet (Commit) bfaf8774 authored tarafından Michael Stahl's avatar Michael Stahl

vcl: fix STL asserts in ~OpenGLContext(), calling wrong erase() overload

Change-Id: Ia830ac1e70f74859dff871f24538af3f2f83fd9d
üst 233cccfe
...@@ -77,7 +77,7 @@ OpenGLContext::~OpenGLContext() ...@@ -77,7 +77,7 @@ OpenGLContext::~OpenGLContext()
#if defined( WNT ) #if defined( WNT )
if (m_aGLWin.hRC) if (m_aGLWin.hRC)
{ {
vShareList.erase(std::remove(vShareList.begin(), vShareList.end(), m_aGLWin.hRC)); vShareList.erase(std::remove(vShareList.begin(), vShareList.end(), m_aGLWin.hRC), vShareList.end());
wglMakeCurrent( m_aGLWin.hDC, 0 ); wglMakeCurrent( m_aGLWin.hDC, 0 );
wglDeleteContext( m_aGLWin.hRC ); wglDeleteContext( m_aGLWin.hRC );
...@@ -90,7 +90,7 @@ OpenGLContext::~OpenGLContext() ...@@ -90,7 +90,7 @@ OpenGLContext::~OpenGLContext()
#elif defined( UNX ) #elif defined( UNX )
if(m_aGLWin.ctx) if(m_aGLWin.ctx)
{ {
vShareList.erase(std::remove( vShareList.begin(), vShareList.end(), m_aGLWin.ctx )); vShareList.erase(std::remove( vShareList.begin(), vShareList.end(), m_aGLWin.ctx), vShareList.end());
glXMakeCurrent(m_aGLWin.dpy, None, NULL); glXMakeCurrent(m_aGLWin.dpy, None, NULL);
if( glGetError() != GL_NO_ERROR ) if( glGetError() != GL_NO_ERROR )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment