Fixes double playing of audio notification if notification and playback device are the same.

1 files changed, 24 insertions, 5 deletions

diff --git a/src/net/java/sip/communicator/impl/notification/SoundNotificationHandlerImpl.java b/src/net/java/sip/communicator/impl/notification/SoundNotificationHandlerImpl.java
index 4cc045b..507353d 100644
--- a/src/net/java/sip/communicator/impl/notification/SoundNotificationHandlerImpl.java
+++ b/src/net/java/sip/communicator/impl/notification/SoundNotificationHandlerImpl.java
@@ -49,14 +49,33 @@ public class SoundNotificationHandlerImpl
         if(isMute())
             return;
 
-        if(action.isSoundNotificationEnabled())
+        boolean playOnlyOnPlayback = true;
+
+        AudioNotifierService audioNotifService
+                    = NotificationActivator.getAudioNotifier();
+        if(audioNotifService != null)
+            playOnlyOnPlayback =
+                audioNotifService.audioOutAndNotificationsShareSameDevice();
+
+        if(playOnlyOnPlayback)
         {
-            play(action, data, false);
+            if(action.isSoundNotificationEnabled()
+                || action.isSoundPlaybackEnabled())
+            {
+                play(action, data, true);
+            }
         }
-
-        if(action.isSoundPlaybackEnabled())
+        else
         {
-            play(action, data, true);
+            if(action.isSoundNotificationEnabled())
+            {
+                play(action, data, false);
+            }
+
+            if(action.isSoundPlaybackEnabled())
+            {
+                play(action, data, true);
+            }
         }
 
         if(action.isSoundPCSpeakerEnabled())