options: fix --include

This is really obnoxious. --include parses into the default profile, but
when used on the command line, it did never get applied. So we have to
apply it when the exact conditions for this are met.

Fixes #4673.
This commit is contained in:
wm4 2017-08-08 15:54:51 +02:00
parent 0e36b77aae
commit f7fb6e186a
1 changed files with 2 additions and 0 deletions

View File

@ -703,6 +703,8 @@ static int m_config_handle_special_options(struct m_config *config,
config->recursion_depth += 1; config->recursion_depth += 1;
config->includefunc(config->includefunc_ctx, param, flags); config->includefunc(config->includefunc_ctx, param, flags);
config->recursion_depth -= 1; config->recursion_depth -= 1;
if (config->recursion_depth == 0 && config->profile_depth == 0)
m_config_finish_default_profile(config, flags);
return 1; return 1;
} }