From 9e59f241b973b0fe523b8a097f2fa8fd9f9bbf65 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Sat, 22 Aug 2015 19:07:12 +0100 Subject: tdf#93188 - avoid crash in media player. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ToggleFloatingMode can be run during dispose, and should handle that, thanks to Maxim Monastirsky for the analysis. Change-Id: I72c5aff9b75fa2c1b6795e239370244dafdafae2 Reviewed-on: https://gerrit.libreoffice.org/17931 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- avmedia/source/framework/mediaplayer.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'avmedia/source') diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index 28adf1959c8e..b9c2b672d387 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -101,12 +101,16 @@ void MediaFloater::ToggleFloatingMode() { ::avmedia::MediaItem aRestoreItem; - mpMediaWindow->updateMediaItem( aRestoreItem ); + if (mpMediaWindow) + mpMediaWindow->updateMediaItem( aRestoreItem ); delete mpMediaWindow; mpMediaWindow = NULL; SfxDockingWindow::ToggleFloatingMode(); + if (isDisposed()) + return; + mpMediaWindow = new MediaWindow( this, true ); mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) ); -- cgit v1.2.3