diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2012-05-22 22:51:50 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2012-05-22 22:51:50 +1000 |
| commit | 1ccbeabedfea83a1c920dd35adef9f528edae680 (patch) | |
| tree | c3cf07b6c9f1b1d4aaa3b7e7d4ffba99395677dc | |
| parent | 0adafd030375a394d75d5345c3e2e0e0c3b7c82c (diff) | |
| parent | 89ae775c72351f3346756d10025cb1cf93d22dab (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework:
Fix a crash in S60MediaPlayerControl::setMedia
| -rw-r--r-- | plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp index 6b88198706..e82045e439 100644 --- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp +++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp @@ -211,9 +211,10 @@ void S60MediaPlayerControl::setMedia(const QMediaContent &source, QIODevice *str m_session->load(source); } else { if (!source.canonicalUrl().isEmpty()) { - delete m_session; - m_session = 0; - m_session = m_service->createPlayerSession(source); + m_session->disconnect(); + m_session->deleteLater(); + m_session = 0; + m_session = m_service->createPlayerSession(source); } QMediaPlayer::MediaStatus mediaStatus = QMediaPlayer::NoMedia; if (m_session && !source.canonicalUrl().isEmpty()) { |