Mercurial > mplayer.hg

diff cfg-mplayer.h @ 34341:946ecaf41dc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't allow option gui-include in config files. This option may only be evaluated after MPlayer has called cfg_read() or a segmentation fault occurs. Prevent this by restricting its usage.
author ib
date Sun, 11 Dec 2011 14:54:56 +0000
parents 93c0ff76db5e
children ff81a1db421e
line wrap: on
line diff
--- a/cfg-mplayer.h	Sun Dec 11 14:44:36 2011 +0000
+++ b/cfg-mplayer.h	Sun Dec 11 14:54:56 2011 +0000
@@ -301,7 +301,7 @@
     {"noenqueue", &enqueue, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"guiwid", "-guiwid has been removed, use -gui-wid instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
     {"gui-wid", &guiWinID, CONF_TYPE_INT, 0, 0, 0, NULL},
-    {"gui-include", cfg_gui_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL},
+    {"gui-include", cfg_gui_include, CONF_TYPE_FUNC_PARAM, CONF_NOCFG|CONF_NOSAVE, 0, 0, NULL},
 #endif
 
     {"noloop", &mpctx_s.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL},