Merge branch 'mkirk/fix-audio-category-for-notifications' into release/2.21.0

7 years ago · 982cf971a1
parent cae40d4087 1ddf3bb4e1
commit 982cf971a1
1 changed files with 5 additions and 5 deletions
--- a/SignalMessaging/environment/OWSAudioSession.swift
+++ b/SignalMessaging/environment/OWSAudioSession.swift
@ -40,7 +40,7 @@ public class OWSAudioSession: NSObject {

        startAudioActivity(audioActivity)

-        guard currentActivities.count == 0 else {
+        guard currentActivities.count == 1 else {
            // We don't want to clobber the audio capabilities configured by (e.g.) media playback or an in-progress call
            Logger.info("\(logTag) in \(#function) not touching audio session since another currentActivity exists.")
            return