diff options
| author | wm4 <wm4@nowhere> | 2015-09-05 15:33:19 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-09-05 15:33:19 +0200 |
| commit | 392ae68e5f802e940b7b7f5a139af7e2698b5e0e (patch) | |
| tree | 1d7bf827311e0f5192c6ab06e5c21e3f55361c34 /player/configfiles.c | |
| parent | a6694b7b96f94dd692b55e6db1a7740ddbe3fdee (diff) | |
| download | mpv-392ae68e5f802e940b7b7f5a139af7e2698b5e0e.tar.bz2 mpv-392ae68e5f802e940b7b7f5a139af7e2698b5e0e.tar.xz | |
options: fix --no-config
This was completely broken. It was checked manually in some config
loading paths, so it appeared to work. But the intention was always to
completely disable reading from the normal config dir. This logic was
broken in commit 2263f37d.
The manual checks are actually redundant, and are not needed if
--no-config is implemented properly - remove them.
Additionally, the change to load the libmpv defaults from an embedded
profile also failed to set "config=no". The option is marked as not
being settable by a config file, and the libmpv default profile is
parsed as a config file, so this option was rejected. Fix it by removing
the CONF_NOCFG flag. (Alternatively, m_config_set_profile() could be
changed not to set the "config file" flag by default, but I'm not
bothering with this.)
Diffstat (limited to 'player/configfiles.c')
| -rw-r--r-- | player/configfiles.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/player/configfiles.c b/player/configfiles.c index 44b811f20e..29acdda6b9 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -59,8 +59,6 @@ static void load_all_cfgfiles(struct MPContext *mpctx, char *section, void mp_parse_cfgfiles(struct MPContext *mpctx) { struct MPOpts *opts = mpctx->opts; - if (!opts->load_config) - return; mp_mk_config_dir(mpctx->global, ""); |