MacGui: disable/enable the encoder options label when needed and fix the encoder preset options when loading a queue item back to the main window.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6354 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 6 insertions, 3 deletions

diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m
index 5f73b566a..8545eb6c3 100644
--- a/macosx/HBVideoController.m
+++ b/macosx/HBVideoController.m
@@ -45,6 +45,8 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
     IBOutlet NSView         *fPresetView;
     IBOutlet NSView         *fSimplePresetView;
 
+    IBOutlet NSTextField    *fEncoderOptionsLabel;
+
     /* Simple Presets Box */
     IBOutlet NSTextField    *fLavcOptionsTextField;
     IBOutlet NSTextField    *fLavcOptionsLabel;
@@ -201,6 +203,7 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
         fVidQualitySlider,
         fVidTwoPassCheck,
         fVidTurboPassCheck,
+        fEncoderOptionsLabel,
         fPictureSettingsField,
         fPictureFiltersField
     };
@@ -281,6 +284,9 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
     /* video encoder */
     self.codec = [queueToApply[@"JobVideoEncoderVcodec"] intValue];
 
+    /* Lets run through the following functions to get variables set there */
+    [self videoEncoderPopUpChanged:nil];
+
     /* advanced x264 options */
     if ([queueToApply[@"x264UseAdvancedOptions"] intValue])
     {
@@ -315,9 +321,6 @@ NSString *HBVideoEncoderChangedNotification = @"HBVideoEncoderChangedNotificatio
         self.lavcOptions = queueToApply[@"VideoOptionExtra"];
     }
 
-    /* Lets run through the following functions to get variables set there */
-    [self videoEncoderPopUpChanged:nil];
-
     /* Video quality */
     self.qualityType = [queueToApply[@"VideoQualityType"] intValue];