Changeset 1703

Timestamp:

Apr 11, 2007, 6:26:38 PM (15 years ago)

Author:

livings124

Message:

better handle non-UTF8 error messages

File:

• trunk/macosx/Torrent.m (modified) (1 diff)

trunk/macosx/Torrent.m

@@ -956 +956 @@
 - (NSString *) errorMessage
 {
-    return [self isError] ? [NSString stringWithUTF8String: fStat->errorString] : @"";
+    if (![self isError])
+        return @"";
+    
+    #warning localize string after release
+    NSString * error;
+    if (!(error = [NSString stringWithUTF8String: fStat->errorString])
+        && !(error = [NSString stringWithCString: fStat->errorString encoding: NSISOLatin1StringEncoding]))
+        error = @"";
+        //error = NSLocalizedString(@"(unreadable error)", "Torrent -> error string unreadable");
+    
+    return error;
 }