From bd561dec2733b0afb101d47e7a896af7ff67dfd1 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Wed, 25 Jan 2006 01:35:28 +0000
Subject: fix bug 544

git-svn-id: https://svn.musicpd.org/mpd/trunk@3859 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/charConv.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/charConv.c b/src/charConv.c
index b12bfb751..2ca786668 100644
--- a/src/charConv.c
+++ b/src/charConv.c
@@ -42,17 +42,10 @@ mpd_sint8 char_conv_latin1ToUtf8 = 0;
 #define BUFFER_SIZE	1024
 
 int setCharSetConversion(char * to, char * from) {
-	if(char_conv_to && char_conv_from) {
-		if (strcmp(from,char_conv_to)==0 &&
-					strcmp(to,char_conv_from)==0) { 
-			char * swap = char_conv_from;
-			char_conv_from = char_conv_to;
-			char_conv_to = swap;
-			return 0;
-		} else if (strcmp(to,char_conv_to)==0 &&
-					strcmp(from,char_conv_from)==0) { 
-			return 0;
-		}
+	if(char_conv_to && char_conv_from &&
+	   strcmp(to,char_conv_to)==0 && strcmp(from,char_conv_from)==0) 
+	{
+		return 0;
 	}
 
 	closeCharSetConversion();
-- 
cgit v1.2.3