diff options
-rw-r--r-- | gui/cfg.c | 2 | ||||
-rw-r--r-- | mpcommon.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -83,7 +83,7 @@ gtkASS_t gtkASS; extern int stop_xscreensaver; extern int m_config_parse_config_file(m_config_t* config, char *conffile); -int disable_gui_conf=0; +extern int disable_gui_conf; static m_config_t * gui_conf; static const m_option_t gui_opts[] = diff --git a/mpcommon.c b/mpcommon.c index d603623964..d1d7316230 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -210,7 +210,9 @@ int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang) /* Parse -noconfig common to both programs */ int disable_system_conf=0; int disable_user_conf=0; -extern int disable_gui_conf; +#ifdef HAVE_NEW_GUI +int disable_gui_conf=0; +#endif /* HAVE_NEW_GUI */ /* Disable all configuration files */ static void noconfig_all(void) |