MacGui: use an pair of 'OK' and 'Cancel' buttons in the defaults sheets instead of a single done button. Fixed the bitrates and mixdowns popups in the audio defaults.

1 files changed, 9 insertions, 6 deletions

diff --git a/macosx/HBAudioDefaultsController.m b/macosx/HBAudioDefaultsController.m
index cc90879de..7f8db2009 100644
--- a/macosx/HBAudioDefaultsController.m
+++ b/macosx/HBAudioDefaultsController.m
@@ -83,14 +83,17 @@ static void *HBAudioDefaultsContext = &HBAudioDefaultsContext;
     }
 }
 
-- (IBAction)done:(id)sender
+- (IBAction)ok:(id)sender
 {
+    self.settings.trackSelectionLanguages = [self.languagesList.selectedLanguages mutableCopy];
     [self.window orderOut:nil];
-    if (self.window.undoManager.canUndo)
-    {
-        self.settings.trackSelectionLanguages = [self.languagesList.selectedLanguages mutableCopy];
-    }
-    [NSApp endSheet:self.window returnCode:self.window.undoManager.canUndo];
+    [NSApp endSheet:self.window returnCode:NSModalResponseOK];
+}
+
+- (IBAction)cancel:(id)sender
+{
+    [self.window orderOut:nil];
+    [NSApp endSheet:self.window returnCode:NSModalResponseCancel];
 }
 
 - (void)dealloc