Switch the few var_GetString remains to var_GetNonEmptyString

[vlc] / src / input / input.c

diff --git a/src/input/input.c b/src/input/input.c
index 5a4db78a4051eab9aac287f159a56dd9e01c62d1..00878167bf2b097c35c1f54bfd2d3f04e211a2b7 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -995,11 +995,13 @@ static int Init( input_thread_t * p_input )
         var_Get( p_input, "sub-autodetect-file", &val );
         if( val.b_bool )
         {
-            char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
+            char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
             char **subs = subtitles_Detect( p_input, psz_autopath,
                                             p_input->p->input.p_item->psz_uri );
             input_source_t *sub;
             i = 0;
+            if( psz_autopath == NULL )
+                psz_autopath = strdup("");
 
             /* Try to autoselect the first autodetected subtitles file
              * if no subtitles file was specified */