RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

options: expand ~ for the include option 

Fixes #1406
This commit is contained in:
Stefano Pigozzi 2014-12-30 09:23:36 +01:00
parent 196d4fce5b
commit 0fa9986a98
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
player/main.c
View File

@ -46,6 +46,7 @@
#include "options/parse_commandline.h" #include "options/parse_commandline.h"
#include "common/playlist.h" #include "common/playlist.h"
#include "options/options.h" #include "options/options.h"
#include "options/path.h"
#include "input/input.h" #include "input/input.h"
#include "audio/decode/dec_audio.h" #include "audio/decode/dec_audio.h"
@ -316,7 +317,10 @@ static void osdep_preinit(int *p_argc, char ***p_argv)
static int cfg_include(void *ctx, char *filename, int flags) static int cfg_include(void *ctx, char *filename, int flags)
{ {
struct MPContext *mpctx = ctx; struct MPContext *mpctx = ctx;
return m_config_parse_config_file(mpctx->mconfig, filename, NULL, flags); char *fname = mp_get_user_path(NULL, mpctx->global, filename);
int r = m_config_parse_config_file(mpctx->mconfig, fname, NULL, flags);
talloc_free(fname);
return r;
} }
struct MPContext *mp_create(void) struct MPContext *mp_create(void)