From 0822485593812dcf3be5c9580d27ba96e7927b02 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 28 Feb 2016 15:05:13 +0200 Subject: [PATCH] Used ISO Latin 1 encoding for text in startup window on OS X Attempts to output errors with bad characters encountered during text lumps parsing were failed miserably because of UTF-8 conversion Example: loading of GZ-Models-r16.pk3 with GZDoom caused 'NSConcreteAttributedString initWithString:: nil value' exception --- src/posix/cocoa/st_console.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/posix/cocoa/st_console.mm b/src/posix/cocoa/st_console.mm index 9618e7222f..b595023987 100644 --- a/src/posix/cocoa/st_console.mm +++ b/src/posix/cocoa/st_console.mm @@ -324,7 +324,8 @@ void FConsoleWindow::AddText(const char* message) void FConsoleWindow::AddText(const PalEntry& color, const char* const message) { - NSString* const text = [NSString stringWithUTF8String:message]; + NSString* const text = [NSString stringWithCString:message + encoding:NSISOLatin1StringEncoding]; NSDictionary* const attributes = [NSDictionary dictionaryWithObjectsAndKeys: [NSFont systemFontOfSize:14.0f], NSFontAttributeName,