fix user being parsed as a path
git-svn-id: https://svn.musicpd.org/mpd/trunk@2377 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
@@ -91,6 +91,8 @@ void closeAudioOutput(AudioOutput * audioOutput) {
|
|||||||
void finishAudioOutput(AudioOutput * audioOutput) {
|
void finishAudioOutput(AudioOutput * audioOutput) {
|
||||||
closeAudioOutput(audioOutput);
|
closeAudioOutput(audioOutput);
|
||||||
audioOutput->finishDriverFunc(audioOutput);
|
audioOutput->finishDriverFunc(audioOutput);
|
||||||
|
free(audioOutput->type);
|
||||||
|
free(audioOutput->name);
|
||||||
free(audioOutput);
|
free(audioOutput);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -201,7 +201,7 @@ void parseOptions(int argc, char ** argv, Options * options) {
|
|||||||
options->logFile = parseConfigFilePath(CONF_LOG_FILE,1);
|
options->logFile = parseConfigFilePath(CONF_LOG_FILE,1);
|
||||||
options->errorFile =
|
options->errorFile =
|
||||||
parseConfigFilePath(CONF_ERROR_FILE, 1);
|
parseConfigFilePath(CONF_ERROR_FILE, 1);
|
||||||
options->usr = parseConfigFilePath(CONF_USER, 0);
|
options->usr = getConfigParamValue(CONF_USER);
|
||||||
options->dbFile = parseConfigFilePath(CONF_DB_FILE, 0);
|
options->dbFile = parseConfigFilePath(CONF_DB_FILE, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user