summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-02-01 11:49:37 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-02-01 11:55:36 (GMT)
commitd785467dbb97d4be9de66504dd6fb891da19abff (patch)
tree4ae42d0eb1cf70a89777d68f33083322a6c1b9ff /src/3rdparty/phonon
parent4a83af372b965b6dbe25f6a08e14aee09bb9355e (diff)
downloadQt-d785467dbb97d4be9de66504dd6fb891da19abff.zip
Qt-d785467dbb97d4be9de66504dd6fb891da19abff.tar.gz
Qt-d785467dbb97d4be9de66504dd6fb891da19abff.tar.bz2
fix crash in Phonon::DS9 backend
When using a VideoWidget in a QGraphicsProxyWidget, then Phonon::DS9 crashed, if the VideoWidget didn't have a MediaSource. Reviewed-by: Thierry
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r--src/3rdparty/phonon/ds9/videowidget.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp
index 091be16..95423c6 100644
--- a/src/3rdparty/phonon/ds9/videowidget.cpp
+++ b/src/3rdparty/phonon/ds9/videowidget.cpp
@@ -218,6 +218,9 @@ namespace Phonon
if (toNative && m_noNativeRendererSupported)
return current; //no switch here
+ if (!mediaObject())
+ return current;
+
//firt we delete the renderer
//initialization of the widgets
for(int i = 0; i < FILTER_COUNT; ++i) {