From 9e37b3cb60234d58d82b652824172d529efc38b9 Mon Sep 17 00:00:00 2001 From: dynaflash Date: Tue, 30 Nov 2010 18:21:33 +0000 Subject: [PATCH] MacGui: fix character encodings in the log file as well as the title popup string in the main menu dialogue. - Patch by axfree. Thanks! - Changes are discussed here: http://forum.handbrake.fr/viewtopic.php?f=4&t=18677 git-svn-id: svn://localhost/HandBrake/trunk@3690 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.m | 4 ++-- macosx/HBOutputRedirect.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index 898bcfa4..c9cd4baf 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1883,8 +1883,8 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It } [fSrcTitlePopUp addItemWithTitle: [NSString - stringWithFormat: @"%s %d - %02dh%02dm%02ds", - title->name,title->index, title->hours, title->minutes, + stringWithFormat: @"%@ %d - %02dh%02dm%02ds", + currentSource, title->index, title->hours, title->minutes, title->seconds]]; } diff --git a/macosx/HBOutputRedirect.m b/macosx/HBOutputRedirect.m index 29ae733f..1b9a3972 100644 --- a/macosx/HBOutputRedirect.m +++ b/macosx/HBOutputRedirect.m @@ -182,7 +182,7 @@ int stderrwrite(void *inFD, const char *buffer, int size) */ - (void)forwardOutput:(NSData *)data { - NSString *string = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding]; + NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; [listeners makeObjectsPerformSelector:forwardingSelector withObject:string]; [string release]; } -- 2.11.0