MacGui: do not play a sound for notification if alerts are disabled in prefs.

diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index 0c7ad25e36cff35c41e3986a83433773253c8c50..ea915976672a575a4425a42407df2b1c7b63ae26 100644 (file)
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -891,12 +891,12 @@
     }
 }
 
-- (void)showNotificationWithTitle:(NSString *)title description:(NSString *)description url:(NSURL *)fileURL
+- (void)showNotificationWithTitle:(NSString *)title description:(NSString *)description url:(NSURL *)fileURL playSound:(BOOL)playSound
 {
     NSUserNotification *notification = [[NSUserNotification alloc] init];
     notification.title = title;
     notification.informativeText = description;
-    notification.soundName = NSUserNotificationDefaultSoundName;
+    notification.soundName = playSound ? NSUserNotificationDefaultSoundName : nil;
     notification.hasActionButton = YES;
     notification.actionButtonTitle = NSLocalizedString(@"Show", @"Notification -> Show in Finder");
     notification.userInfo = @{ @"Path": fileURL.path };
@@ -952,10 +952,7 @@
         [[NSUserDefaults standardUserDefaults] integerForKey:@"HBAlertWhenDone"] == HBDoneActionAlertAndNotification)
     {
         // If Play System Alert has been selected in Preferences
-        if ([[NSUserDefaults standardUserDefaults] boolForKey:@"HBAlertWhenDoneSound"] == YES)
-        {
-            NSBeep();
-        }
+        bool playSound = [[NSUserDefaults standardUserDefaults] boolForKey:@"HBAlertWhenDoneSound"];
 
         NSString *title;
         NSString *description;
@@ -975,7 +972,8 @@
 
         [self showNotificationWithTitle:title
                             description:description
-                                    url:job.completeOutputURL];
+                                    url:job.completeOutputURL
+                                playSound:playSound];
     }
 }