summaryrefslogtreecommitdiffstats
path: root/macosx/Controller.m
diff options
context:
space:
mode:
authordynaflash <[email protected]>2010-08-05 16:45:00 +0000
committerdynaflash <[email protected]>2010-08-05 16:45:00 +0000
commitcf982f896f80ed72e3c046dee0af49d1a1f4c9e6 (patch)
tree2fe600a3a615cb07ddd34cfb86b6fe8ab2ecc050 /macosx/Controller.m
parent254404475b82b21a5d49ee8c65f0df9e9937c0be (diff)
MacGui: Disable preview hud controls during new source scans.
- Fixes a crash where trying to get a preview image when a new source is being loaded will cause a crash - Mirrors enableUI in the main window. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3471 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.m')
-rw-r--r--macosx/Controller.m14
1 files changed, 9 insertions, 5 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 5bba38c54..86674adea 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -594,19 +594,23 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
}
- if (b) {
+ if (b)
+ {
/* if we're enabling the interface, check if the audio mixdown controls need to be enabled or not */
/* these will have been enabled by the mass control enablement above anyway, so we're sense-checking it here */
[self setEnabledStateOfAudioMixdownControls:nil];
/* we also call calculatePictureSizing here to sense check if we already have vfr selected */
[self calculatePictureSizing:nil];
-
- } else {
+ /* Also enable the preview window hud controls */
+ [fPictureController enablePreviewHudControls];
+ }
+ else
+ {
[fPresetsOutlineView setEnabled: NO];
-
- }
+ [fPictureController disablePreviewHudControls];
+ }
[self videoMatrixChanged:nil];
[fAdvancedOptions enableUI:b];