@@ -749,27 +749,16 @@ encoding = OF_STRING_ENCODING_ISO_8859_15; if ([contentType hasSuffix: @"encoding=windows-1252"]) encoding = OF_STRING_ENCODING_WINDOWS_1252; } - if (encoding == OF_STRING_ENCODING_AUTODETECT) { - @try { - self = [[c alloc] - initWithCString: (char*)[[result data] cArray] - encoding: OF_STRING_ENCODING_UTF_8 - length: [[result data] count]]; - } @catch (OFInvalidEncodingException *e) { - self = [[c alloc] - initWithCString: (char*)[[result data] cArray] - encoding: OF_STRING_ENCODING_ISO_8859_1 - length: [[result data] count]]; - } - } else { - self = [[c alloc] initWithCString: (char*)[[result data] cArray] - encoding: encoding - length: [[result data] count]]; - } + if (encoding == OF_STRING_ENCODING_AUTODETECT) + encoding = OF_STRING_ENCODING_UTF_8; + + self = [[c alloc] initWithCString: (char*)[[result data] cArray] + encoding: encoding + length: [[result data] count]]; [pool release]; return self; }