Commit 83f9323e authored by ivoire's avatar ivoire
Browse files

variables: when the variable already exist, check the type only (integer,

float, ...), so remove all the flags before the check.
parent 7e3455ac
......@@ -193,15 +193,15 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
if( i_new >= 0 )
{
/* If the types differ, variable creation failed. */
if( (i_type & ~(VLC_VAR_DOINHERIT|VLC_VAR_ISCOMMAND)) != p_priv->p_vars[i_new].i_type )
if( (i_type & VLC_VAR_TYPE) != (p_priv->p_vars[i_new].i_type & VLC_VAR_TYPE) )
{
vlc_mutex_unlock( &p_priv->var_lock );
return VLC_EBADVAR;
}
p_priv->p_vars[i_new].i_usage++;
if( i_type & VLC_VAR_ISCOMMAND )
p_priv->p_vars[i_new].i_type |= VLC_VAR_ISCOMMAND;
p_priv->p_vars[i_new].i_type |= ( i_type & VLC_VAR_ISCOMMAND );
p_priv->p_vars[i_new].i_type |= ( i_type & VLC_VAR_HASCHOICE );
vlc_mutex_unlock( &p_priv->var_lock );
return VLC_SUCCESS;
}
......
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