Mercurial > mplayer.hg

diff cfg-mplayer.h @ 34169:9b617726812c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sanitize include behaviour. The normal func_param argument type will iterate over all previous values each time a new value is assigned. This leads e.g. to a complete mess and non-working recursion limiting when creating a config file that includes itself. Seem to also fix bug #1994.
author reimar
date Tue, 25 Oct 2011 20:18:35 +0000
parents 11d9ef2177ec
children 93c0ff76db5e
line wrap: on
line diff
--- a/cfg-mplayer.h	Tue Oct 25 19:22:10 2011 +0000
+++ b/cfg-mplayer.h	Tue Oct 25 20:18:35 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_IMMEDIATE, CONF_NOSAVE, 0, 0, NULL},
 #endif
 
     {"noloop", &mpctx_s.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL},