[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Caolán McNamara]

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

New commits:
commit c76aa66c60bde1fd009f097a0b974b65b295d1ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 26 12:41:10 2017 +0100

    Resolves: tdf#108069 2nd OpenGLContext::init should dispose earlier results
    
    Change-Id: If6bb9517a4081576347d71ddf26d020119d34247
    (cherry picked from commit 0b9b36cafe29916a9fdeac420a49c174adb10c59)
    Reviewed-on: https://gerrit.libreoffice.org/38065
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 33d80095b15c..fc12d88617ff 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -240,7 +240,8 @@ bool OpenGLContext::init( vcl::Window* pParent )
     mpWindow = pParent ? pParent : m_xWindow.get();
     if(m_xWindow)
         m_xWindow->setPosSizePixel(0,0,0,0);
-    m_pChildWindow = nullptr;
+    //tdf#108069 we may be initted twice, so dispose earlier effort
+    m_pChildWindow.disposeAndClear();
     initWindow();
     return ImplInit();
 }