summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-23 21:24:50 +0200
committerwm4 <wm4@nowhere>2016-09-23 21:24:50 +0200
commit9eef41dec15580623cfa62909221fbc1fbf41706 (patch)
treedc03baf40c1905f3af4725404ad16d909f0d1964 /player
parentf0fd6633205fe0b477032d2be5028a204c327e0b (diff)
downloadmpv-9eef41dec15580623cfa62909221fbc1fbf41706.tar.bz2
mpv-9eef41dec15580623cfa62909221fbc1fbf41706.tar.xz
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.
Diffstat (limited to 'player')
-rw-r--r--player/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/player/main.c b/player/main.c
index 676f82946c..cecdc15392 100644
--- a/player/main.c
+++ b/player/main.c
@@ -399,6 +399,9 @@ int mp_initialize(struct MPContext *mpctx, char **options)
mp_print_version(mpctx->log, false);
+ if (opts->operation_mode == 1)
+ m_config_set_profile(mpctx->mconfig, "pseudo-gui", M_SETOPT_NO_OVERWRITE);
+
mp_parse_cfgfiles(mpctx);
if (options) {