[MPlayer-cvslog] r34257 - in trunk: cfg-common.h cfg-mplayer.h m_option.c m_option.h

[Ingo Brückl]

Reimar Döffinger wrote on Sun, 11 Dec 2011 16:18:20 +0100:

> On Tue, Dec 06, 2011 at 06:52:14PM +0100, Ingo Brückl wrote:
>> This actually segfaults for the very same reason (MPlayer didn't have called
>> cfg_read() before). I suggest the attached patch.
>>
>> Ingo

>> Index: cfg-mplayer.h
>> ===================================================================
>> --- cfg-mplayer.h     (revision 34368)
>> +++ cfg-mplayer.h     (working copy)
>> @@ -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},

> Sorry for not replying. Yes, applying this is obviously a good idea.
> Of course it wouldn't hurt to make it work nicely (also e.g. allowing
> to use it in the main config file to specify settings that should only
> be used when then gui is enabled), but that might be overkill...

I'll keep that in mind. Forcing CONF_NOCFG doesn't have to be the final
solution.

Ingo