diff options
| author | dynaflash <[email protected]> | 2010-11-30 18:21:33 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2010-11-30 18:21:33 +0000 |
| commit | 057feb69bc3c615fefae4aad5cf8adb07df6a7b2 (patch) | |
| tree | b4e97d866d0ed261871624364b632991df1b276e | |
| parent | 52146d5dab53232965a8599993bd538c769b6a11 (diff) | |
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://svn.handbrake.fr/HandBrake/trunk@3690 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | macosx/Controller.m | 4 | ||||
| -rw-r--r-- | macosx/HBOutputRedirect.m | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 898bcfa4f..c9cd4bafe 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 29ae733f2..1b9a39727 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]; } |