summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-08-11 12:46:40 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-08-11 12:48:43 (GMT)
commitcd649261f902c96c065d44591f6ee76a9b2be5dc (patch)
treecca32895f10ea17f2b865a1d1c8cbf409479c2b3 /src
parentbead88ed4149202638167499e50148ae9fb7ab3e (diff)
downloadQt-cd649261f902c96c065d44591f6ee76a9b2be5dc.zip
Qt-cd649261f902c96c065d44591f6ee76a9b2be5dc.tar.gz
Qt-cd649261f902c96c065d44591f6ee76a9b2be5dc.tar.bz2
Phonon: avoids assert when switching source
The problem was that when switching source, the previous one was still running. So we now explicitly stop it.
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/phonon/ds9/mediaobject.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp
index a4feef6..22f1527 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.cpp
+++ b/src/3rdparty/phonon/ds9/mediaobject.cpp
@@ -512,6 +512,8 @@ namespace Phonon
qSwap(m_graphs[0], m_graphs[1]); //swap the graphs
+ m_graphs[1]->stop(); //make sure we stop the previous graph
+
if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid &&
catchComError(currentGraph()->renderResult())) {
setState(Phonon::ErrorState);