Skip to content

V
vlc-2-2
Commit be7f7794 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

skins: fix crash if input-title-format is empty 

(cherry picked from commit 541b381c676cc96b6e1967610a2077b00950b86d)
parent 618e9dd9
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
modules/gui/skins2/src/vlcproc.cpp
View file @ be7f7794
...@@ -738,9 +738,15 @@ void VlcProc::update_current_input() ...@@ -738,9 +738,15 @@ void VlcProc::update_current_input()
{ {
// Update short name (as defined by --input-title-format) // Update short name (as defined by --input-title-format)
char *psz_fmt = var_InheritString( getIntf(), "input-title-format" ); char *psz_fmt = var_InheritString( getIntf(), "input-title-format" );
char *psz_name = str_format_meta( pInput, psz_fmt ); char *psz_name = NULL;
SET_TEXT( m_cVarStreamName, UString( getIntf(), psz_name ) ); if( psz_fmt != NULL )
free( psz_fmt ); {
psz_name = str_format_meta( pInput, psz_fmt );
free( psz_fmt );
}
SET_TEXT( m_cVarStreamName, UString( getIntf(),
psz_name ? psz_name : "" ) );
free( psz_name ); free( psz_name );
// Update local path (if possible) or full uri // Update local path (if possible) or full uri
......
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