Don't allow option gui-include in config files.
authorib <ib@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sun, 11 Dec 2011 14:54:56 +0000 (14:54 +0000)
committerib <ib@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sun, 11 Dec 2011 14:54:56 +0000 (14:54 +0000)
This option may only be evaluated after MPlayer has called cfg_read()
or a segmentation fault occurs. Prevent this by restricting its usage.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@34429 b3059339-0415-0410-9bf9-f77b7e298cf2

cfg-mplayer.h

index 3b3f13c..91efdda 100644 (file)
@@ -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},