diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 15:52:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 15:52:31 (GMT) |
| commit | 82c6507e63655a84d490d7b83e964d77c5d8a6df (patch) | |
| tree | 853d16d0c0324587cf18e38dafc51da15f71b1d5 /src/3rdparty | |
| parent | 4b79b6a982d51b068a533ea56682aaffcf958c74 (diff) | |
| parent | 0c5524e73848b95276f13c384d2c711188936deb (diff) | |
| download | Qt-82c6507e63655a84d490d7b83e964d77c5d8a6df.zip Qt-82c6507e63655a84d490d7b83e964d77c5d8a6df.tar.gz Qt-82c6507e63655a84d490d7b83e964d77c5d8a6df.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed crash in Phonon MMF backend during application shutdown
Fixed bitfield-related crash on Symbian WINSCW
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/mmf/videoplayer_dsa.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp b/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp index 21cdb16..732d2d9 100644 --- a/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp +++ b/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp @@ -162,7 +162,10 @@ void MMF::DsaVideoPlayer::prepareCompleted() void MMF::DsaVideoPlayer::handleVideoWindowChanged() { if (!m_window) { - m_window = QApplication::activeWindow()->effectiveWinId()->DrawableWindow(); + if (QWidget *window = QApplication::activeWindow()) + m_window = window->effectiveWinId()->DrawableWindow(); + else + m_window = 0; m_videoScreenRect = TRect(); } @@ -213,6 +216,9 @@ void MMF::DsaVideoPlayer::handleParametersChanged(VideoParameters parameters) TRACE_CONTEXT(DsaVideoPlayer::handleParametersChanged, EVideoInternal); TRACE_ENTRY_0(); + if (!m_window) + return; + #ifndef QT_NO_DEBUG getDsaRegion(m_wsSession, *m_window); #endif |