From 09f98c01f1e35638813b3d59a735064292d5938a Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Sun, 23 Sep 2007 09:21:58 +0000 Subject: [PATCH] fix osdmenu-file-path option --- src/osd/osd_parser.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/osd/osd_parser.c b/src/osd/osd_parser.c index c2b5a002ea..848cfb5708 100644 --- a/src/osd/osd_parser.c +++ b/src/osd/osd_parser.c @@ -340,13 +340,11 @@ int osd_ConfigLoader( vlc_object_t *p_this, const char *psz_file, size_t i_len = 0; long pos = 0; + result = fscanf(fd, "%24s %255s", &action[0], &path[0] ); + /* override images path ? */ psz_path = config_GetPsz( p_this, "osdmenu-file-path" ); - if( psz_path == NULL ) - { - result = fscanf(fd, "%24s %255s", &action[0], &path[0] ); - } - else + if( psz_path ) { /* psz_path is not null and therefor &path[0] cannot be NULL * it might be null terminated. -- 2.39.2