diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-26 12:41:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-26 13:44:01 +0200 |
| commit | 3e368230eb28cd88a9491f6ca7a16a65e2774263 (patch) | |
| tree | 76e2eb44786492a36a2cf8fb57699078d0d2a4a5 /vcl | |
| parent | 21b7cb2737d95f281e28e248c4dad306a5c6463f (diff) | |
Resolves: tdf##108069 2nd OpenGLContext::init should dispose earlier results
Change-Id: If6bb9517a4081576347d71ddf26d020119d34247
(cherry picked from commit 0b9b36cafe29916a9fdeac420a49c174adb10c59)
Reviewed-on: https://gerrit.libreoffice.org/38064
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 3 |
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(); } |