From 6fe83fdc339aad0b5ddadbe55d25c57bc490640e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 22 Sep 2016 20:35:38 +0200
Subject: player: some M_SETOPT_RUNTIME cleanups

Add this flag where needed. You shouldn't be able to set e.g. config-dir
in these situations.

Remove the mpctx->initialized check from the property/option bridge,
since it's in use strictly only after initialization. Likewise, the
apply-profile command doesn't need to check this.
---
 player/configfiles.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'player/configfiles.c')

diff --git a/player/configfiles.c b/player/configfiles.c
index 95eb91c377..3ab0d368bc 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -92,7 +92,8 @@ static int try_load_config(struct MPContext *mpctx, const char *file, int flags)
 
 // Set options file-local, and don't set them if the user set them via the
 // command line.
-#define FILE_LOCAL_FLAGS (M_SETOPT_BACKUP | M_SETOPT_PRESERVE_CMDLINE)
+#define FILE_LOCAL_FLAGS \
+    (M_SETOPT_BACKUP | M_SETOPT_RUNTIME | M_SETOPT_PRESERVE_CMDLINE)
 
 static void mp_load_per_file_config(struct MPContext *mpctx)
 {
-- 
cgit v1.2.3