summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
Diffstat (limited to 'player')
-rw-r--r--player/javascript/defaults.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/player/javascript/defaults.js b/player/javascript/defaults.js
index 4393925efe..8f5d3089ec 100644
--- a/player/javascript/defaults.js
+++ b/player/javascript/defaults.js
@@ -773,5 +773,8 @@ g.mp_event_loop = function mp_event_loop() {
// let the user extend us, e.g. by adding items to mp.module_paths
// (unlike e.g. read_file, file_info doesn't expand meta-paths)
-if (mp.utils.file_info(mp.utils.get_user_path("~~/.init.js")))
+if (mp.get_property_bool("config") && // --no-config disables custom init
+ mp.utils.file_info(mp.utils.get_user_path("~~/.init.js")))
+{
require("~~/.init");
+}