From e5f252531f3b2941183b16c6250fd391d735338d Mon Sep 17 00:00:00 2001 From: Saito Date: Tue, 3 Feb 2004 07:11:06 +0000 Subject: [PATCH] Fix timidity_pre_load_configuration(). --- ChangeLog | 1 + timidity/timidity.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9cc8e25..498f6771 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Fix some initializations. Fix some free() functions. Implement opt_default_module. + Fix timidity_pre_load_configuration(). 2004-02-02 Kentaro Sato diff --git a/timidity/timidity.c b/timidity/timidity.c index aaba9c76..3e30cae4 100644 --- a/timidity/timidity.c +++ b/timidity/timidity.c @@ -4764,8 +4764,10 @@ MAIN_INTERFACE int timidity_pre_load_configuration(void) if((check = open(local, 0)) >= 0) { close(check); - if(!read_config_file(local, 0)) + if(!read_config_file(local, 0)) { got_a_configuration = 1; + return 0; + } } /* Next, try read configuration file which is in the @@ -4781,16 +4783,20 @@ MAIN_INTERFACE int timidity_pre_load_configuration(void) if((check = open(local, 0)) >= 0) { close(check); - if(!read_config_file(local, 0)) + if(!read_config_file(local, 0)) { got_a_configuration = 1; + return 0; + } } } } #else /* UNIX */ - if(!read_config_file(CONFIG_FILE, 0)) - got_a_configuration = 1; + if(!read_config_file(CONFIG_FILE, 0)) { + got_a_configuration = 1; + return 0; + } #endif /* Try read configuration file which is in the -- 2.11.0