aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-10-29 16:12:36 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-10-29 16:12:36 +0000
commit6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d (patch)
tree0c35bea4dce1546329cf9d3062f53e8dfec04f2f /src/main.c
parent65a956db17d1bb31412234a4a96c0b1c50b3c09c (diff)
downloadmpd-6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d.tar.gz
mpd-6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d.tar.xz
mpd-6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d.zip
sync w/ trunk
git-svn-id: https://svn.musicpd.org/mpd/branches/shank-rewrite-config@2398 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index f56d74939..d4732f046 100644
--- a/src/main.c
+++ b/src/main.c
@@ -201,7 +201,7 @@ void parseOptions(int argc, char ** argv, Options * options) {
options->logFile = parseConfigFilePath(CONF_LOG_FILE,1);
options->errorFile =
parseConfigFilePath(CONF_ERROR_FILE, 1);
- options->usr = parseConfigFilePath(CONF_USER, 0);
+ options->usr = getConfigParamValue(CONF_USER);
options->dbFile = parseConfigFilePath(CONF_DB_FILE, 0);
return;
}