avmedia/source/viewer/mediawindow_impl.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4cf32fcaf3e5ed442874b59e0995829630153f90
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Sun May 25 15:17:04 2014 +0200
fdo#79133: avoid segmentation fault during destruction of media window
mpEvents is not initialized in the constructor any more:
b5529c8c457f442bfc43305becc0c02d6a09ee80
So it can happen that mpEvents is null.
(cherry picked from commit 4ec3554a80f065c2d9c957d6ce7f577fb195be02)
Change-Id: Idaaa274e39c1ac34270ae5b0acdd237ee5aec1c3
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx
b/avmedia/source/viewer/mediawindow_impl.cxx
index 6ebe2f7..993a8fc 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -178,7 +178,8 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent,
MediaWindow* pMediaWindow, bo
MediaWindowImpl::~MediaWindowImpl()
{
- mpEvents->cleanUp();
+ if( mpEvents )
+ mpEvents->cleanUp();
if( mxPlayerWindow.is() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
