5 files changed, 21 insertions, 0 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 4c4d4b4dc..d990118a1 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -134,6 +134,7 @@
     /* Subtitles box */
     IBOutlet NSTextField         * fSubField;
     IBOutlet NSPopUpButton       * fSubPopUp;
+	IBOutlet NSButton            * fSubForcedCheck;
 	
     /* Audio box */
     IBOutlet NSTextField         * fAudLang1Field;
@@ -272,6 +273,7 @@
 - (IBAction) AudioTrackPopUpChanged: (id) sender;
 - (IBAction) AudioTrackPopUpChanged: (id) sender mixdownToUse: (int) mixdownToUse;
 - (IBAction) AudioTrackMixdownChanged: (id) sender;
+- (IBAction) SubtitleSelectionChanged: (id) sender;
 
 - (IBAction) BrowseFile: (id) sender;
 - (void)     BrowseFileDone: (NSSavePanel *) sheet
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 620996647..8f9d6c858 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1866,6 +1866,8 @@ list = hb_get_titles( fHandle );
             subtitle->lang] action: NULL keyEquivalent: @""];
     }
     [fSubPopUp selectItemAtIndex: 0];
+	
+	[self SubtitleSelectionChanged: NULL];
     
     /* Update chapter table */
     [fChapterTitlesDelegate resetWithTitle:title];
@@ -2497,6 +2499,21 @@ list = hb_get_titles( fHandle );
     }
 
 }
+
+- (IBAction) SubtitleSelectionChanged: (id) sender
+{
+	if ([fSubPopUp indexOfSelectedItem] == 0)
+	{
+	[fSubForcedCheck setState: NSOffState];
+	[fSubForcedCheck setEnabled: NO];	
+	}
+	else
+	{
+	[fSubForcedCheck setEnabled: YES];	
+	}
+	
+}
+
 /* lets set the picture size back to the max from right after title scan
    Lets use an IBAction here as down the road we could always use a checkbox
    in the gui to easily take the user back to max. Remember, the compiler
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index a949990ee..6c29793e7 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -37,6 +37,7 @@
                 ShowPicturePanel = id; 
                 ShowQueuePanel = id; 
                 ShowScanPanel = id; 
+                SubtitleSelectionChanged = id; 
                 TitlePopUpChanged = id; 
                 TwoPassCheckboxChanged = id; 
                 VideoFrameRateChanged = id; 
@@ -150,6 +151,7 @@
                 fSrcTitlePopUp = NSPopUpButton; 
                 fStatusField = NSTextField; 
                 fSubField = NSTextField; 
+                fSubForcedCheck = NSButton; 
                 fSubPopUp = NSPopUpButton; 
                 fVidBitrateCell = NSButtonCell; 
                 fVidBitrateField = NSTextField; 
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 16076eacd..a9982a965 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
index c4997993e..9d32ae061 100644
--- a/macosx/English.lproj/Preferences.nib/keyedobjects.nib
+++ b/macosx/English.lproj/Preferences.nib/keyedobjects.nib