Skip to content

V
vlc-2-2
Commit e6b02bf4 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Qt: fix a deadlock in the information panel.

parent 756001fb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/gui/qt4/components/info_panels.cpp
View file @ e6b02bf4
...@@ -186,6 +186,7 @@ void MetaPanel::update( input_item_t *p_item ) ...@@ -186,6 +186,7 @@ void MetaPanel::update( input_item_t *p_item )
/* Name / Title */ /* Name / Title */
psz_meta = input_item_GetTitle( p_item ); psz_meta = input_item_GetTitle( p_item );
psz_meta = input_item_GetTitle( p_item );
char *psz_name = input_item_GetName( p_item ); char *psz_name = input_item_GetName( p_item );
if( !EMPTY_STR( psz_meta ) ) if( !EMPTY_STR( psz_meta ) )
title_text->setText( qfu( psz_meta ) ); title_text->setText( qfu( psz_meta ) );
...@@ -377,7 +378,10 @@ void ExtraMetaPanel::update( input_item_t *p_item ) ...@@ -377,7 +378,10 @@ void ExtraMetaPanel::update( input_item_t *p_item )
vlc_mutex_lock( &p_item->lock ); vlc_mutex_lock( &p_item->lock );
vlc_meta_t *p_meta = p_item->p_meta; vlc_meta_t *p_meta = p_item->p_meta;
if( !p_meta ) if( !p_meta )
{
vlc_mutex_unlock( &p_item->lock );
return; return;
}
vlc_dictionary_t * p_dict = &p_meta->extra_tags; vlc_dictionary_t * p_dict = &p_meta->extra_tags;
char ** ppsz_allkey = vlc_dictionary_all_keys( p_dict ); char ** ppsz_allkey = vlc_dictionary_all_keys( p_dict );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment