diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-18 13:51:37 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:01:25 +0100 |
| commit | 739f3a5c2b5410685b22d920e8d6c4d59567dfd3 (patch) | |
| tree | 7a5dd06b65bd74d537890267adae2debccfca8bf /avmedia | |
| parent | f583322c079c4bbc4be21ee3ba5d1d1b91c3d061 (diff) | |
mend misc. lifecycle breakage.
Change-Id: I6e960db9659f5122a45c4cf173e680bb782acf76
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 5ff2f062ce9e..4d5eaa49b714 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -508,12 +508,14 @@ void MediaWindowImpl::onURLChanged() { if( m_sMimeType == AVMEDIA_MIMETYPE_COMMON ) { + mpChildWindow.disposeAndClear(); mpChildWindow.reset(new MediaChildWindow(this) ); } #if HAVE_FEATURE_GLTF else if ( m_sMimeType == AVMEDIA_MIMETYPE_JSON ) { SystemWindowData aWinData = OpenGLContext::generateWinData(this, false); + mpChildWindow.disposeAndClear(); mpChildWindow.reset(new MediaChildWindow(this,&aWinData)); mbEventTransparent = false; } |