From ec2425ad5fb39df5ad952b27d49e172fdd7ff00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 7 Jun 2016 14:28:15 +0100
Subject: [PATCH] Resolves: tdf#100258 crash on disposing media player

SfxDockingWindow::dispose() will call SetFloatingMode false
its floating, which recreates the mpMediaWindow and so
the assert occurs about living children.

So toggle out of floating mode before deleting mpMediaWindow
to avoid that

Change-Id: I0b1cae149261fa43611b9f9a39465ce718e33484
---
 avmedia/source/framework/mediaplayer.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 638b7b9dabeb..4b3a9e016c7b 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -67,15 +67,18 @@ MediaFloater::~MediaFloater()
     disposeOnce();
 }
 
-
 void MediaFloater::dispose()
 {
+    if (IsFloatingMode())
+    {
+        Show(false, ShowFlags::NoFocusChange);
+        SetFloatingMode(false);
+    }
     delete mpMediaWindow;
     mpMediaWindow = nullptr;
     SfxDockingWindow::dispose();
 }
 
-
 void MediaFloater::Resize()
 {
     SfxDockingWindow::Resize();
@@ -84,7 +87,6 @@ void MediaFloater::Resize()
         mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
 }
 
-
 void MediaFloater::ToggleFloatingMode()
 {
     ::avmedia::MediaItem aRestoreItem;