Mercurial > mplayer.hg

changeset 34181:93c0ff76db5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use CONF_TYPE_FUNC_PARAM for option gui-include. MPlayer must have called cfg_read() where gui.conf is read and m_config_t *gui_conf is set, before cfg_gui_include() may be called. This fixes a segmentation fault and partly reverts r34257.
author ib
date Wed, 26 Oct 2011 19:39:14 +0000
parents 61f7925ff295
children b86eb5d72594
files cfg-mplayer.h
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-mplayer.h	Wed Oct 26 18:26:51 2011 +0000
+++ b/cfg-mplayer.h	Wed Oct 26 19:39:14 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_IMMEDIATE, CONF_NOSAVE, 0, 0, NULL},
+    {"gui-include", cfg_gui_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL},
 #endif
 
     {"noloop", &mpctx_s.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL},