[Libreoffice-commits] core.git: vcl/source

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Tue May 24 14:09:57 UTC 2016


 vcl/source/opengl/OpenGLContext.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ada1f674902467940e9b4d13fc8100690d7e07d8
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue May 24 22:57:21 2016 +0900

    opengl: prevent seg. fault - VCL_GL_INFO still needs the context
    
    Change-Id: Iaf71104d85e8a0b8f5b101f614a6c4b90ce63f87
    Reviewed-on: https://gerrit.libreoffice.org/25409
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 29e5436..ea90537 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -84,10 +84,11 @@ OpenGLContext::OpenGLContext():
 
 OpenGLContext::~OpenGLContext()
 {
-    VCL_GL_INFO("delete context: " << this);
     assert (mnRefCount == 0);
 
     mnRefCount = 1; // guard the shutdown paths.
+    VCL_GL_INFO("delete context: " << this);
+
     reset();
 
     ImplSVData* pSVData = ImplGetSVData();


More information about the Libreoffice-commits mailing list