diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-10-28 05:30:22 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-10-28 05:30:22 +0000 |
| commit | ac44e94f2f0e978941a1d29b89f3926cc66ebf3e (patch) | |
| tree | c90054f83c53fcd1585a03061a56f5f5e2cdb07a | |
| parent | a5e3445697be9d3e379e6282c89e556ccdc5d18f (diff) | |
| download | mpd-ac44e94f2f0e978941a1d29b89f3926cc66ebf3e.tar.gz mpd-ac44e94f2f0e978941a1d29b89f3926cc66ebf3e.tar.xz mpd-ac44e94f2f0e978941a1d29b89f3926cc66ebf3e.zip | |
fix user being parsed as a path
git-svn-id: https://svn.musicpd.org/mpd/trunk@2377 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/audioOutput.c | 2 | ||||
| -rw-r--r-- | src/main.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/audioOutput.c b/src/audioOutput.c index 0175ed04f..902edbccb 100644 --- a/src/audioOutput.c +++ b/src/audioOutput.c @@ -91,6 +91,8 @@ void closeAudioOutput(AudioOutput * audioOutput) { void finishAudioOutput(AudioOutput * audioOutput) { closeAudioOutput(audioOutput); audioOutput->finishDriverFunc(audioOutput); + free(audioOutput->type); + free(audioOutput->name); free(audioOutput); } 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; } |