summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-05-25 15:17:04 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-05-25 15:17:04 +0200
commit4cf32fcaf3e5ed442874b59e0995829630153f90 (patch)
treeac64e7ed46729de7fa452fad11ad772d907aea7d
parent53ebf689076ab2283124c8b1cbd891e77d6c928f (diff)
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
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 6ebe2f70f56e..993a8fc266d4 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() )
{