summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-02-10 05:46:53 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-02-10 05:46:53 (GMT)
commitaec0628295cda95f2169e3007368797ba6585ee3 (patch)
tree922c80ae9a7b68c76532486599562ee9e23dce08
parente6646c68cf273934b74acd40492d63b447cf800c (diff)
downloadQt-aec0628295cda95f2169e3007368797ba6585ee3.zip
Qt-aec0628295cda95f2169e3007368797ba6585ee3.tar.gz
Qt-aec0628295cda95f2169e3007368797ba6585ee3.tar.bz2
Fix crash on exit in player example on Windows.
Explicitly clear the QPointer to QVideoWidget on destruction, otherwise the destruction of the QVideoWidget will seeminly attempt to clear an invalidated QPointer.
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 0853597..d3dfbb2 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -308,6 +308,8 @@ QMediaPlayer::~QMediaPlayer()
Q_D(QMediaPlayer);
d->provider->releaseService(d->service);
+ d->videoWidget = 0;
+ d->videoItem = 0;
}
QMediaContent QMediaPlayer::media() const