summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorritsuka <[email protected]>2015-01-31 07:32:00 +0000
committerritsuka <[email protected]>2015-01-31 07:32:00 +0000
commitf30872bdcb2f5a97eddfbb3ea9e06d952cf29042 (patch)
tree43dd06ea2fe51b78eba4a398317811700cba11c8 /macosx
parent652858987e87aedf12a6197976ffdf4b9ca40d88 (diff)
MacGui: do not apply the same preset to a job two times.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6838 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/HBController.m4
-rw-r--r--macosx/HBVideoController.m8
2 files changed, 4 insertions, 8 deletions
diff --git a/macosx/HBController.m b/macosx/HBController.m
index df36adc14..24969c0dd 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -864,10 +864,6 @@
else
{
self.job = [[[HBJob alloc] initWithTitle:title andPreset:self.selectedPreset] autorelease];
-
- // apply the current preset
- [self applyPreset:self.selectedPreset];
-
self.job.destURL = [self destURLForJob:self.job];
}
diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m
index 5a22333ed..16b1c6d7e 100644
--- a/macosx/HBVideoController.m
+++ b/macosx/HBVideoController.m
@@ -273,15 +273,15 @@ static void *HBVideoControllerContext = &HBVideoControllerContext;
*/
- (void)setupPresetsSlider
{
+ // setup the preset slider
+ [fPresetsSlider setMaxValue:self.video.presets.count - 1];
+ [fPresetsSlider setNumberOfTickMarks:self.video.presets.count];
+
// Bind the slider value to a custom value transformer,
// done here because it can't be done in IB.
[fPresetsSlider unbind:@"value"];
HBPresetsTransformer *transformer = [[[HBPresetsTransformer alloc] initWithEncoder:self.video.encoder] autorelease];
[fPresetsSlider bind:@"value" toObject:self withKeyPath:@"self.video.preset" options:@{NSValueTransformerBindingOption: transformer}];
-
- // setup the preset slider
- [fPresetsSlider setMaxValue:self.video.presets.count - 1];
- [fPresetsSlider setNumberOfTickMarks:self.video.presets.count];
}