diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-26 12:41:10 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-29 10:12:27 +0200 |
| commit | c76aa66c60bde1fd009f097a0b974b65b295d1ab (patch) | |
| tree | b3100a46e441732bf0504c4ef708466c16d55bca | |
| parent | 2990a2c2b29ca5c3316f28e5d3be74220c4948a4 (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/38065
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -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 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(); } |