summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-03 15:41:08 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-03 15:45:01 (GMT)
commit1a03f7a1163b8aea69b54066f25f6b935352b6d8 (patch)
tree7b412ff81c30838ea249fc0603fa89023251709d /src
parentd436493da1e01ac460f42ea0f58be00d8c6fdaea (diff)
downloadQt-1a03f7a1163b8aea69b54066f25f6b935352b6d8.zip
Qt-1a03f7a1163b8aea69b54066f25f6b935352b6d8.tar.gz
Qt-1a03f7a1163b8aea69b54066f25f6b935352b6d8.tar.bz2
Fixed crash opening audio clip when video clip currently open
Task-number: QTBUG-5302 Reviewed-by: trustme
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/phonon/mmf/mmf_videoplayer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
index d1d2337..fe469cf 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
@@ -110,6 +110,9 @@ MMF::VideoPlayer::~VideoPlayer()
TRACE_CONTEXT(VideoPlayer::~VideoPlayer, EVideoApi);
TRACE_ENTRY_0();
+ if (m_videoOutput)
+ m_videoOutput->setObserver(0);
+
TRACE_EXIT_0();
}