From d13d75949f2582091fd07590716f01622233a250 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Thu, 30 Jun 2011 14:35:59 +1000 Subject: 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 Reviewed-by: Michael Goddard --- src/plugins/qt7/qt7movieviewrenderer.mm | 2 ++ 1 file changed, 2 insertions(+) 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()) { -- cgit v1.2.3