diff options
| author |  wm4 <wm4@nowhere> | 2017-08-08 15:54:51 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-08-08 15:54:51 +0200 |
| commit | f7fb6e186ad7f9ed22ccb016a5a0bfe52c2ebe0f (patch) | |
| tree | 5f04b6749160d9e4119384eb1842b445e90dc2b4 /options | |
| parent | 0e36b77aae1ac2af68a45db07d4ff09d9f6dcb30 (diff) | |
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.
Diffstat (limited to 'options')
| -rw-r--r-- | options/m_config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/options/m_config.c b/options/m_config.c index 65807bb14e..378bed25ad 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -703,6 +703,8 @@ static int m_config_handle_special_options(struct m_config *config, config->recursion_depth += 1; config->includefunc(config->includefunc_ctx, param, flags); config->recursion_depth -= 1; + if (config->recursion_depth == 0 && config->profile_depth == 0) + m_config_finish_default_profile(config, flags); return 1; } |