Merge pull request #115 from Ghabry/icu

Accept ambigious icu encodings (like windows-1252)
EasyRPG · Jul 2, 2014 · d8f6a45 · d8f6a45
2 parents f12b80e + 3fb817e
commit d8f6a45
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/reader_util.cpp b/src/reader_util.cpp
@@ -257,6 +257,12 @@ std::string ReaderUtil::Recode(const std::string& str_to_encode,
 	std::string result_str;
 
 	conv = ucnv_open(encoding_str.c_str(), &status);
+
+	if (status != U_ZERO_ERROR && status != U_AMBIGUOUS_ALIAS_WARNING) {
+		return std::string();
+	}
+	status = U_ZERO_ERROR;
+
 	length = ucnv_toUChars(conv, unicode_str, size, str_to_encode.c_str(), -1, &status);
 	ucnv_close(conv);
 	if (status != U_ZERO_ERROR) return std::string();