From 9eef41dec15580623cfa62909221fbc1fbf41706 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 23 Sep 2016 21:24:50 +0200 Subject: player: do not let pseudo-gui override user config settings Seems like this confused users quite often. Instead of --profile=pseudo-gui, --player-operation-mode=pseudo-gui now has to be used to invoke pseudo GUI mode. The old way still works, and still behaves in the old way. --- options/m_config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'options/m_config.h') diff --git a/options/m_config.h b/options/m_config.h index 4571488051..94a6c9e6ee 100644 --- a/options/m_config.h +++ b/options/m_config.h @@ -40,6 +40,7 @@ struct mp_log; struct m_config_option { bool is_hidden : 1; // Does not show up in help bool is_set_from_cmdline : 1; // Set by user from command line + bool is_set_from_config : 1; // Set by a config file bool is_set_locally : 1; // Has a backup entry bool warning_was_printed : 1; int16_t shadow_offset; // Offset into m_config_shadow.data @@ -155,6 +156,7 @@ enum { M_SETOPT_PRESERVE_CMDLINE = 32, // Don't set if already marked as FROM_CMDLINE M_SETOPT_NO_FIXED = 64, // Reject M_OPT_FIXED options M_SETOPT_NO_PRE_PARSE = 128, // Reject M_OPT_PREPARSE options + M_SETOPT_NO_OVERWRITE = 256, // Skip options marked with FROM_* }; // Flags for safe option setting during runtime. -- cgit v1.2.3