summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorRodeo <[email protected]>2013-04-09 12:17:42 +0000
committerRodeo <[email protected]>2013-04-09 12:17:42 +0000
commit00685e5dbcb9754dfb2e2fe1ab4e88f2fbf3a7f0 (patch)
tree981659f2a1f19ab24201984d8c12aa459791755b /macosx
parent723b3b4035dabf2dded9d36323d73f794aa85242 (diff)
MacGui: fix a bug when saving a preset, the x264 system is used but the unparsed string is empty (all defaults).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5387 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.m11
1 files changed, 9 insertions, 2 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 0b2d42d52..51c4be181 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -7016,8 +7016,15 @@ return YES;
* bonus: set the unparsed options to make the preset compatible
* with old HB versions
*/
- [preset setObject:[NSString stringWithUTF8String:fX264PresetsUnparsedUTF8String]
- forKey:@"x264Option"];
+ if (fX264PresetsUnparsedUTF8String != NULL)
+ {
+ [preset setObject:[NSString stringWithUTF8String:fX264PresetsUnparsedUTF8String]
+ forKey:@"x264Option"];
+ }
+ else
+ {
+ [preset setObject:@"" forKey:@"x264Option"];
+ }
}
/* FFmpeg (lavc) Option String */