From f7fb6e186ad7f9ed22ccb016a5a0bfe52c2ebe0f Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 8 Aug 2017 15:54:51 +0200 Subject: 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. --- options/m_config.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'options/m_config.c') 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; } -- cgit v1.2.3