Kaydet (Commit) 25db60d2 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Partly revert 4ec3554a

mpEvents is freed by other object so using
scoped_ptr lead to crash.

Change-Id: I28c9d322b5ee5da6edf5022da18b42f59b608dec
üst a850d96f
......@@ -510,8 +510,7 @@ void MediaWindowImpl::onURLChanged()
if( !mpChildWindow )
return;
mpChildWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
mpEvents.reset(new MediaEventListenersImpl( *mpChildWindow.get() ) );
mxEventsIf.set( static_cast< ::cppu::OWeakObject* >( mpEvents.get() ) );
mxEventsIf.set( static_cast< ::cppu::OWeakObject* >( mpEvents = new MediaEventListenersImpl( *mpChildWindow.get() ) ) );
if( mxPlayer.is() )
{
......
......@@ -171,7 +171,7 @@ namespace avmedia
MediaWindow* mpMediaWindow;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxEventsIf;
boost::scoped_ptr<MediaEventListenersImpl> mpEvents;
MediaEventListenersImpl* mpEvents;
bool mbEventTransparent;
boost::scoped_ptr<MediaChildWindow> mpChildWindow;
MediaWindowControl* mpMediaWindowControl;
......
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