diff -r 5dc02b23752f -r 3e2da88830cd src/3rdparty/phonon/mmf/videoplayer_dsa.cpp --- a/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -61,6 +61,8 @@ void MMF::DsaVideoPlayer::videoWindowScreenRectChanged() { + Q_ASSERT(m_videoOutput); + QRect windowRect = static_cast(m_videoOutput)->videoWindowScreenRect(); // Clip to physical window size @@ -124,12 +126,12 @@ // CVideoPlayerUtility::NewL starts DSA m_dsaActive = true; - - m_player->RegisterForVideoLoadingNotification(*this); } void MMF::DsaVideoPlayer::initVideoOutput() { + Q_ASSERT(m_videoOutput); + bool connected = connect( m_videoOutput, SIGNAL(videoWindowScreenRectChanged()), this, SLOT(videoWindowScreenRectChanged()) @@ -156,7 +158,8 @@ void MMF::DsaVideoPlayer::prepareCompleted() { - videoWindowScreenRectChanged(); + if (m_videoOutput) + videoWindowScreenRectChanged(); } void MMF::DsaVideoPlayer::handleVideoWindowChanged()