[vlmc-devel] MetadataManager: Fix potential dead lock

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Sep  6 15:55:25 2012 +0300| [74991e0f58b18760935dabc3a5390d751703d355] | committer: Hugo Beauzée-Luyssen

MetadataManager: Fix potential dead lock

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=74991e0f58b18760935dabc3a5390d751703d355
---

 src/Metadata/MetaDataManager.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Metadata/MetaDataManager.cpp b/src/Metadata/MetaDataManager.cpp
index f6a18a2..b7f65e8 100644
--- a/src/Metadata/MetaDataManager.cpp
+++ b/src/Metadata/MetaDataManager.cpp
@@ -51,9 +51,11 @@ MetaDataManager::launchComputing( Media *media )
     connect( worker, SIGNAL( computed() ),
              this, SLOT( computingCompleted() ),
              Qt::DirectConnection );
+    //This connection has to be queued, as we would risk stopping the media player
+    //from within a VLC callback.
     connect( worker, SIGNAL( failed( Media* ) ),
              this, SLOT( computingFailed( Media* ) ),
-             Qt::DirectConnection );
+             Qt::QueuedConnection );
     worker->compute();
 }