diff options
| author | ritsuka <[email protected]> | 2014-11-23 13:32:54 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2014-11-23 13:32:54 +0000 |
| commit | 40b699f2cbb07961e08a8f828bdd7ea4c2dbfe29 (patch) | |
| tree | 0032e0f82ceb5e218f085b21fd4fe17fa4adf82e /macosx | |
| parent | 4adb1db133bd77fa11dbbc95dccaafa9f2ebfe68 (diff) | |
MacGui: revert part of the previous commit.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6543 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Controller.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 9bc89cb4a..a9f58c885 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -4836,7 +4836,8 @@ the user is using "Custom" settings by determining the sender*/ * If not 2 it must be 1 here which means "Use the picture * size specified in the preset" */ - if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] != 2) + if ([[chosenPreset objectForKey:@"UsesPictureSettings"] intValue] != 2 && + [[chosenPreset objectForKey:@"UsesMaxPictureSettings"] intValue] != 1) { /* * if the preset specifies neither max. width nor height |