From 1dd1cb8c70a8986c1acc911a663d99d7043d15c7 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 8 Jul 2009 14:26:57 +0200
Subject: Phonon: Fixed a possible race condition

Task-number: 257495
---
 src/3rdparty/phonon/ds9/mediaobject.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp
index 26ba8eb..f77bdc1 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.cpp
+++ b/src/3rdparty/phonon/ds9/mediaobject.cpp
@@ -207,12 +207,14 @@ namespace Phonon
 
             HRESULT hr = S_OK;
 
-            QMutexLocker locker(&m_mutex);
-            m_currentRender = w.graph;
-			m_currentRenderId = w.id;
-            if (w.task == ReplaceGraph) {
-                HANDLE h;
+            {
+                QMutexLocker locker(&m_mutex);
+                m_currentRender = w.graph;
+			    m_currentRenderId = w.id;
+            }
 
+            if (w.task == ReplaceGraph) {
+                QMutexLocker locker(&m_mutex);
                 int index = -1;
                 for(int i = 0; i < FILTER_COUNT; ++i) {
                     if (m_graphHandle[i].graph == w.oldGraph) {
@@ -228,6 +230,7 @@ namespace Phonon
                 Q_ASSERT(index != -1);
 
                 //add the new graph
+                HANDLE h;
                 if (SUCCEEDED(ComPointer<IMediaEvent>(w.graph, IID_IMediaEvent)
                     ->GetEventHandle(reinterpret_cast<OAEVENT*>(&h)))) {
                     m_graphHandle[index].graph = w.graph;
@@ -324,8 +327,11 @@ namespace Phonon
                 }
             }
 
-            m_currentRender = Graph();
-			m_currentRenderId = 0;
+            {
+                QMutexLocker locker(&m_mutex);
+                m_currentRender = Graph();
+			    m_currentRenderId = 0;
+            }
 
         }
 
-- 
cgit v0.12