summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-11-26 15:58:02 +0100
committerMichael Stahl <mstahl@redhat.com>2014-11-26 16:00:02 +0100
commitbfaf877421bff1db74d1ba84a039075baf9d5800 (patch)
treee2cc6cc2bf0f52945fb6597e2405b45f9dc5e229
parent233cccfe31135d77815e4c09374a18238310cc68 (diff)
vcl: fix STL asserts in ~OpenGLContext(), calling wrong erase() overload
Change-Id: Ia830ac1e70f74859dff871f24538af3f2f83fd9d
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index a93185f385f4..534ce88aa753 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -77,7 +77,7 @@ OpenGLContext::~OpenGLContext()
#if defined( WNT )
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 );
wglDeleteContext( m_aGLWin.hRC );
@@ -90,7 +90,7 @@ OpenGLContext::~OpenGLContext()
#elif defined( UNX )
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);
if( glGetError() != GL_NO_ERROR )