X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fcharsetconverter.cpp;h=b56eb2dc8edd3b50dbe802604c9e4d4dbef4502e;hb=dec33c63afafabf83c3039e916725cac6faef9b3;hp=f6f73d4e0afe6ce152147b899e26f356c7c8cffb;hpb=bae54a5dae027ad0a6b0126ec9eeecd3bd2739eb;p=fms.git

diff --git a/src/charsetconverter.cpp b/src/charsetconverter.cpp
index f6f73d4..b56eb2d 100644
--- a/src/charsetconverter.cpp
+++ b/src/charsetconverter.cpp
@@ -39,6 +39,7 @@ const bool CharsetConverter::SetConversion(const std::string &fromcharset, const
 	{
 		m_fromcharset="";
 		m_tocharset="";
+		return false;
 	}
 }
 
@@ -48,7 +49,7 @@ const bool CharsetConverter::Convert(const std::string &input, std::string &outp
 	{
 		std::vector<char> invec(input.begin(),input.end());
 		std::vector<char> outvec(invec.size()*4,0);
-#ifdef _WIN32
+#if defined(_WIN32) //|| defined(__APPLE__) || defined(__DARWIN__)
 		const char *inptr=&invec[0];
 #else
 		char *inptr=&invec[0];
@@ -65,6 +66,7 @@ const bool CharsetConverter::Convert(const std::string &input, std::string &outp
 			outvec.resize(outptr-&outvec[0]);
 			output="";
 			output.append(outvec.begin(),outvec.end());
+			return true;
 		}
 		else
 		{