Kaydet (Commit) ec2425ad authored tarafından Caolán McNamara's avatar Caolán McNamara

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
üst 93f3bd54
...@@ -67,15 +67,18 @@ MediaFloater::~MediaFloater() ...@@ -67,15 +67,18 @@ MediaFloater::~MediaFloater()
disposeOnce(); disposeOnce();
} }
void MediaFloater::dispose() void MediaFloater::dispose()
{ {
if (IsFloatingMode())
{
Show(false, ShowFlags::NoFocusChange);
SetFloatingMode(false);
}
delete mpMediaWindow; delete mpMediaWindow;
mpMediaWindow = nullptr; mpMediaWindow = nullptr;
SfxDockingWindow::dispose(); SfxDockingWindow::dispose();
} }
void MediaFloater::Resize() void MediaFloater::Resize()
{ {
SfxDockingWindow::Resize(); SfxDockingWindow::Resize();
...@@ -84,7 +87,6 @@ void MediaFloater::Resize() ...@@ -84,7 +87,6 @@ void MediaFloater::Resize()
mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) ); mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
} }
void MediaFloater::ToggleFloatingMode() void MediaFloater::ToggleFloatingMode()
{ {
::avmedia::MediaItem aRestoreItem; ::avmedia::MediaItem aRestoreItem;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment