summaryrefslogtreecommitdiff
path: root/vcl/source/opengl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-26 12:41:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-26 12:41:10 +0100
commit0b9b36cafe29916a9fdeac420a49c174adb10c59 (patch)
tree0190d967b22928ffa2b6715fab5ccb8c3da782ed /vcl/source/opengl
parentdd55370d637a2f5d397a0a24ccfbc107b64a4ad1 (diff)
Resolves: tdf##108069 2nd OpenGLContext::init should dispose earlier results
Change-Id: If6bb9517a4081576347d71ddf26d020119d34247
Diffstat (limited to 'vcl/source/opengl')
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 72e7f3cbc32d..541491100bf5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -234,7 +234,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();
}