Commit 09f98c01 authored by Jean-Paul Saman's avatar Jean-Paul Saman

fix osdmenu-file-path option

parent 74da71f8
...@@ -340,13 +340,11 @@ int osd_ConfigLoader( vlc_object_t *p_this, const char *psz_file, ...@@ -340,13 +340,11 @@ int osd_ConfigLoader( vlc_object_t *p_this, const char *psz_file,
size_t i_len = 0; size_t i_len = 0;
long pos = 0; long pos = 0;
result = fscanf(fd, "%24s %255s", &action[0], &path[0] );
/* override images path ? */ /* override images path ? */
psz_path = config_GetPsz( p_this, "osdmenu-file-path" ); psz_path = config_GetPsz( p_this, "osdmenu-file-path" );
if( psz_path == NULL ) if( psz_path )
{
result = fscanf(fd, "%24s %255s", &action[0], &path[0] );
}
else
{ {
/* psz_path is not null and therefor &path[0] cannot be NULL /* psz_path is not null and therefor &path[0] cannot be NULL
* it might be null terminated. * it might be null terminated.
......
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