# HG changeset patch # User ib # Date 1323615296 0 # Node ID 946ecaf41dc16861668b3965ea1d897227a2ed84 # Parent ce8b1d7d54fefd8876db9e1932af0fe37e237ca1 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. diff -r ce8b1d7d54fe -r 946ecaf41dc1 cfg-mplayer.h --- a/cfg-mplayer.h Sun Dec 11 14:44:36 2011 +0000 +++ b/cfg-mplayer.h Sun Dec 11 14:54:56 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, CONF_NOCFG|CONF_NOSAVE, 0, 0, NULL}, #endif {"noloop", &mpctx_s.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL},