[vlc-devel] commit: Qt: fix a deadlock in the information panel. ( Rémi Duraffort )

git version control git at videolan.org
Tue Jul 22 22:57:17 CEST 2008


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Jul 22 22:59:13 2008 +0200| [e6b02bf4983e3c7dc9694f0ca2727016117134ee]

Qt: fix a deadlock in the information panel.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e6b02bf4983e3c7dc9694f0ca2727016117134ee
---

 modules/gui/qt4/components/info_panels.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index afcd93f..f7d542f 100644
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -186,6 +186,7 @@ void MetaPanel::update( input_item_t *p_item )
 
     /* Name / Title */
     psz_meta = input_item_GetTitle( p_item );
+    psz_meta = input_item_GetTitle( p_item );
     char *psz_name = input_item_GetName( p_item );
     if( !EMPTY_STR( psz_meta ) )
         title_text->setText( qfu( psz_meta ) );
@@ -377,7 +378,10 @@ void ExtraMetaPanel::update( input_item_t *p_item )
     vlc_mutex_lock( &p_item->lock );
     vlc_meta_t *p_meta = p_item->p_meta;
     if( !p_meta )
+    {
+        vlc_mutex_unlock( &p_item->lock );
         return;
+    }
 
     vlc_dictionary_t * p_dict = &p_meta->extra_tags;
     char ** ppsz_allkey = vlc_dictionary_all_keys( p_dict );




More information about the vlc-devel mailing list