diff options
| author | wm4 <wm4@nowhere> | 2012-08-04 11:39:23 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-04 19:59:56 +0200 |
| commit | 70c455a59610242fc982e257c375f43c880ff0f7 (patch) | |
| tree | 6dfbfbde1a17cec876bc9aa598137389bb1d4794 /m_config.c | |
| parent | 6031b8e22ce34754218ddcd98d4758ab46d647b8 (diff) | |
| download | mpv-70c455a59610242fc982e257c375f43c880ff0f7.tar.bz2 mpv-70c455a59610242fc982e257c375f43c880ff0f7.tar.xz | |
m_options: get rid of CONF_NOSAVE
This was already treated like CONF_GLOBAL.
Profiles can actually be file-local, as long as the profile sets file
local options only. Allow them to do so.
Diffstat (limited to 'm_config.c')
| -rw-r--r-- | m_config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m_config.c b/m_config.c index 0edf7d9023..f2f621d0fa 100644 --- a/m_config.c +++ b/m_config.c @@ -196,7 +196,7 @@ struct m_config *m_config_new(void *optstruct, char *filename)) { static const struct m_option ref_opts[] = { - { "profile", NULL, CONF_TYPE_STRING_LIST, CONF_NOSAVE, 0, 0, NULL }, + { "profile", NULL, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, { "show-profile", show_profile, CONF_TYPE_PRINT_FUNC, CONF_NOCFG }, { "list-options", list_options, CONF_TYPE_PRINT_FUNC, CONF_NOCFG }, { NULL } @@ -212,7 +212,7 @@ struct m_config *m_config_new(void *optstruct, if (includefunc) { struct m_option *p = talloc_ptrtype(config, p); *p = (struct m_option){ - "include", NULL, CONF_TYPE_STRING, CONF_NOSAVE, + "include", NULL, CONF_TYPE_STRING, 0, }; m_config_add_option(config, p, NULL, NULL); config->includefunc = includefunc; @@ -232,7 +232,7 @@ static void ensure_backup(struct m_config *config, struct m_config_option *co) return; if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) return; - if (co->opt->flags & (M_OPT_GLOBAL | M_OPT_NOSAVE)) + if (co->opt->flags & M_OPT_GLOBAL) return; if (co->flags & M_CFG_OPT_ALIAS) return; |