Merge pull request #1639 from nextcloud/fix-audio-crash

Fix race condition when retrieving current output
nextcloud · May 6, 2024 · 24d3aa9 · 24d3aa9
2 parents 1384276 + 4d3ed1b
commit 24d3aa9
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/NextcloudTalk/NCAudioController.m b/NextcloudTalk/NCAudioController.m
@@ -131,14 +131,10 @@ - (void)disableAudioSession
 - (void)updateRouteInformation
 {
     AVAudioSession *audioSession = self.rtcAudioSession.session;
-    AVAudioSessionPortDescription *currentOutput = nil;
+    AVAudioSessionPortDescription *currentOutput = [audioSession.currentRoute.outputs firstObject];
 
     self.numberOfAvailableInputs = audioSession.availableInputs.count;
 
-    if (audioSession.currentRoute.outputs.count > 0) {
-        currentOutput = audioSession.currentRoute.outputs[0];
-    }
-
     if ([_rtcAudioSession mode] == AVAudioSessionModeVideoChat || [currentOutput.portType isEqualToString:AVAudioSessionPortBuiltInSpeaker]) {
         self.isSpeakerActive = YES;
     } else {