diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-08-22 19:07:12 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-22 19:09:11 +0000 |
commit | 444c76830b75528a8130484e24781333535200f3 (patch) | |
tree | 7e8aa918adb1a19b42ba5823736151317302feca /avmedia | |
parent | bcb881e6d3fec1c4db31f2af8b30f1cf5ad72c43 (diff) |
tdf#93188 - avoid crash in media player.
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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() ) ); |