diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /options/parse_configfile.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'options/parse_configfile.c')
| -rw-r--r-- | options/parse_configfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/options/parse_configfile.c b/options/parse_configfile.c index e7c877349d..0ef80082d4 100644 --- a/options/parse_configfile.c +++ b/options/parse_configfile.c @@ -150,7 +150,8 @@ int m_config_parse(m_config_t *config, const char *location, bstr data, } } - m_config_finish_default_profile(config, flags); + if (config->recursion_depth == 0) + m_config_finish_default_profile(config, flags); talloc_free(tmp); return 1; |