From 1be8d376dd4b73ff395dbcf5de77198fe772d677 Mon Sep 17 00:00:00 2001 From: albeu Date: Mon, 24 Jun 2002 12:17:23 +0000 Subject: Fix after the patch of Dominik Mierzejewski. Try the user's input.conf before the global one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6552 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index ed26c0d94d..7745eaa1cf 100644 --- a/input/input.c +++ b/input/input.c @@ -298,7 +298,7 @@ static mp_cmd_t* ar_cmd = NULL; static unsigned int ar_delay = 100, ar_rate = 8, last_ar = 0; static int use_joystick = 1, use_lirc = 1; -static char* config_file = CONFDIR"/input.conf"; +static char* config_file = "input.conf"; static char* js_dev = NULL; @@ -1250,8 +1250,12 @@ mp_input_init(void) { if(!file) return; - if(! mp_input_parse_config(file)) - mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n"); + if(! mp_input_parse_config(file)) { + // Try global conf dir + file = CONFDIR"/input.conf"; + if(! mp_input_parse_config(file)) + mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n"); + } #ifdef HAVE_JOYSTICK if(use_joystick) { -- cgit v1.2.3