summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-14 13:52:59 +0100
committerwm4 <wm4@nowhere>2014-02-14 14:01:27 +0100
commitce6fb9175c104113396949f50364b0a49d69c9c6 (patch)
tree1c52dbb5cdf34d53506b497404ac4ab2c17fd655 /player
parentc2e8f8fb89efe82a653832ba31ce74a5ff431c12 (diff)
downloadmpv-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 'player')
-rw-r--r--player/lua/osc.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 5bf150274d..033f2c0d7e 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -121,7 +121,7 @@ function read_config(options, identifier)
local conffilename = "plugin_" .. identifier .. ".conf"
local conffile = mp.find_config_file(conffilename)
- local f = io.open(conffile,"r")
+ local f = conffile and io.open(conffile,"r")
if f == nil then
-- config not found
else