diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-09-08 15:57:55 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-18 10:10:33 +0200 |
| commit | 6a1d0e9bad0f115a6209c7f3e5c9b844827e789f (patch) | |
| tree | 65e8c1ab607781f7a5596f9af622ce508ad801c4 /avmedia | |
| parent | be7183d5ccee954c5bb219eee98062c4ea7f3c94 (diff) | |
tdf#94006 - need an explicit dispose for GLContext's SystemChildWindow.
Previously we would get an explicit ~OpenGLContext - and potentially
leave FMR's around for other OGC users, now we treat the other users
properly - we need an explicit dispose() to get Window::dispose ordering
right.
Reviewed-on: https://gerrit.libreoffice.org/18412
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Conflicts:
vcl/source/window/openglwin.cxx
Change-Id: I5edcbd73399b6db3dbcfb391570f364f9ab0c70d
Reviewed-on: https://gerrit.libreoffice.org/18414
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 7d04807b6b72..7ddaa502e1b9 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -41,6 +41,7 @@ OGLPlayer::~OGLPlayer() { m_xContext->makeCurrent(); gltf_renderer_release(m_pHandle); + m_xContext->dispose(); } releaseInputFiles(); } |