diff options
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index 69760c8642..ae35f3d5e2 100644 --- a/mencoder.c +++ b/mencoder.c @@ -311,9 +311,11 @@ static void mencoder_exit(int level, const char *how) static void parse_cfgfiles( m_config_t* conf ) { char *conffile; - if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0) + if (!disable_system_conf && + m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0) mencoder_exit(1,MSGTR_ConfigFileError); + if (!disable_user_conf) { if ((conffile = get_path("mencoder.conf")) == NULL) { mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); } else { @@ -321,6 +323,7 @@ static void parse_cfgfiles( m_config_t* conf ) mencoder_exit(1,MSGTR_ConfigFileError); free(conffile); } + } } |