From 4c1eb9225d5a741e1234d48eb38a8df3da908259 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Sun, 21 Mar 2004 21:32:23 +0000
Subject: add aac_decode.[ch] and start working on it also, if locale is C or
 POSIX, set fs charset to iso-8859-1

git-svn-id: https://svn.musicpd.org/mpd/trunk@347 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/directory.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/directory.c')

diff --git a/src/directory.c b/src/directory.c
index 673754044..2d672afce 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -548,7 +548,8 @@ int readDirectoryDB() {
 				else if(0==strncmp(DIRECTORY_FS_CHARSET,buffer,
 						strlen(DIRECTORY_FS_CHARSET)))
 				{
-					char * fsCharset; 
+					char * fsCharset;
+					char * tempCharset; 
 
 					if(foundFsCharset) {
 						ERROR("already found "
@@ -560,15 +561,14 @@ int readDirectoryDB() {
 
 					fsCharset = &(buffer[strlen(
 							DIRECTORY_FS_CHARSET)]);
-					if(getConf()[CONF_FS_CHARSET] && 
-							strcmp(fsCharset,
-							getFsCharset())) 
+					if((tempCharset = 
+						getConf()[CONF_FS_CHARSET]) && 
+						strcmp(fsCharset,tempCharset))
 					{
 						ERROR("Using \"%s\" for the "
 							"filesystem charset "
 							"instead of \"%s\"\n",
-							fsCharset,
-							getFsCharset());
+							fsCharset,tempCharset);
 						ERROR("maybe you need to "
 							"recreate the db?\n");
 						setFsCharset(fsCharset);
-- 
cgit v1.2.3