[MPlayer-cvslog] r34269 - trunk/cfg-mplayer.h

[ib]

Author: ib
Date: Wed Oct 26 21:39:14 2011
New Revision: 34269

Log:
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.

Modified:
   trunk/cfg-mplayer.h

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Wed Oct 26 20:26:51 2011	(r34268)
+++ trunk/cfg-mplayer.h	Wed Oct 26 21:39:14 2011	(r34269)
@@ -301,7 +301,7 @@ const m_option_t mplayer_opts[]={
     {"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},