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

[ib]

Author: ib
Date: Sun Dec 11 15:54:56 2011
New Revision: 34429

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

Modified:
   trunk/cfg-mplayer.h

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Sun Dec 11 15:44:36 2011	(r34428)
+++ trunk/cfg-mplayer.h	Sun Dec 11 15:54:56 2011	(r34429)
@@ -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, 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},