MacGui: fix character encodings in the log file as well as the title popup string...

- 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

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 898bcfa4f0b8fcfeec1cb854aec6c83bec82c513..c9cd4bafea242f5dff1f9033a56b5a5f737593f6 100644 (file)
--- 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 29ae733f2d5ecb07d8834c17ee70f23d27efa34f..1b9a3972781028f194911aef73054318877e4e8c 100644 (file)
--- 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];
 }