diff options
| author | wm4 <wm4@nowhere> | 2014-02-14 13:52:59 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-02-14 14:01:27 +0100 |
| commit | ce6fb9175c104113396949f50364b0a49d69c9c6 (patch) | |
| tree | 1c52dbb5cdf34d53506b497404ac4ab2c17fd655 /DOCS | |
| parent | c2e8f8fb89efe82a653832ba31ce74a5ff431c12 (diff) | |
| download | mpv-ce6fb9175c104113396949f50364b0a49d69c9c6.tar.bz2 mpv-ce6fb9175c104113396949f50364b0a49d69c9c6.tar.xz | |
options: make --no-config block all auto-loaded configuration files
Until now, the --no-config was explicitly checked in multiple places to
suppress loading of config files.
Add such a check to the config path code itself, and refuse to resolve
_any_ configuration file locations if the option is set.
osc.lua needs a small fixup, because it didn't handle the situation when
no path was returned. There may some of such cases in the C code too,
but I didn't find any on a quick look.
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/en/options.rst | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index ce3b730387..da67544d3f 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1412,10 +1412,8 @@ OPTIONS ``--no-config`` Do not load default configuration files. This prevents loading of ``~/.mpv/config`` and ``~/.mpv/input.conf``, as well as loading the - same files from system wide configuration directories. - - Loading of some configuration files is not affected by this option, such - as configuration files for DVB code and fontconfig. + same files from system wide configuration directories. Other configuration + files are blocked as well, such as resume playback files. .. note:: |