diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-06-30 14:35:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 06:50:08 +0200 |
| commit | d13d75949f2582091fd07590716f01622233a250 (patch) | |
| tree | fe5efe3309bb3eabf11444c972de12c96629f8af /src/plugins | |
| parent | ca25844e528432dfa55e5136bf56faeb0b47c937 (diff) | |
Stay away from unnecessary code paths if the movie is 0 (NULL)
When closing a QT7PlayerSession, it sets the movie to 0. There is no
need to check if a NULL movie supports the core pixel formats, and
that check lead to a segmentation fault with QtSDK 1.1.1.
Task-number: QTMOBILITY-1746
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit b5d9964aab96ef1a02ca1af411178f05c42c2bf8)
Change-Id: I7cdddbd8fc1b8d8d667747aec3567aeb857accd6
Reviewed-on: http://codereview.qt.nokia.com/984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qt7/qt7movieviewrenderer.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qt7/qt7movieviewrenderer.mm b/src/plugins/qt7/qt7movieviewrenderer.mm index b9d4f64b9..284c8ce5d 100644 --- a/src/plugins/qt7/qt7movieviewrenderer.mm +++ b/src/plugins/qt7/qt7movieviewrenderer.mm @@ -283,6 +283,8 @@ void QT7MovieViewRenderer::setupVideoOutput() [movieView setMovie:(QTMovie*)m_movie]; [movieView setDrawRect:QRect(QPoint(0,0), m_nativeSize)]; + } else { + m_nativeSize = QSize(); } if (m_surface && !m_nativeSize.isEmpty()) { |