Skip to content

Commit e925fba

Browse files
committed
IOS-9939. Potential infinite loop in AudioPlayerManager
1 parent e353f2a commit e925fba

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

iMEGA/AudioPlayer/AudioPlayer/AudioPlayerManager.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,12 @@ import MEGADomain
440440
miniPlayerRouter?.start()
441441
return
442442
}
443-
let currentMiniPlayerHandler = miniPlayerHandlerListenerManager.listeners.last
444-
if currentMiniPlayerHandler?.containsMiniPlayerInstance() == true {
445-
currentMiniPlayerHandler?.showMiniPlayer()
443+
guard let currentMiniPlayerHandler = miniPlayerHandlerListenerManager.listeners.last else { return }
444+
445+
if currentMiniPlayerHandler.containsMiniPlayerInstance() {
446+
currentMiniPlayerHandler.showMiniPlayer()
446447
} else {
447-
currentMiniPlayerHandler?.presentMiniPlayer(miniPlayerVC)
448+
currentMiniPlayerHandler.presentMiniPlayer(miniPlayerVC)
448449
}
449450
}
450451

iMEGA/Node/Links/Folder/FolderLinkViewController+AudioPlayer.swift

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ extension FolderLinkViewController: AudioMiniPlayerHandlerProtocol, AudioPlayerP
3232
}
3333

3434
func showMiniPlayer() {
35-
AudioPlayerManager.shared.showMiniPlayer()
3635
adjustMiniPlayerDisplay(isHidden: false)
3736
}
3837

@@ -65,7 +64,7 @@ extension FolderLinkViewController: AudioMiniPlayerHandlerProtocol, AudioPlayerP
6564

6665
@objc func shouldShowMiniPlayer() {
6766
if AudioPlayerManager.shared.isPlayerAlive() {
68-
showMiniPlayer()
67+
AudioPlayerManager.shared.showMiniPlayer()
6968
}
7069
}
7170

0 commit comments

Comments
 (0)