From b2bfa4c002d92e1ff18b885421fabbad34c32cb1 Mon Sep 17 00:00:00 2001 From: Kieran Hannigan Date: Sat, 30 Dec 2023 11:16:10 +0800 Subject: [PATCH] [Fix] Prevent crash from force unwrapping nil value in PR #1005 --- ios/App/Shared/player/AudioPlayer.swift | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift index 8ee98a52..bf67fbb0 100644 --- a/ios/App/Shared/player/AudioPlayer.swift +++ b/ios/App/Shared/player/AudioPlayer.swift @@ -583,30 +583,33 @@ class AudioPlayer: NSObject { commandCenter.playCommand.isEnabled = true commandCenter.playCommand.addTarget { [weak self] event in - if (self!.isPlaying()) { - self?.pause() + guard let strongSelf = self else { return .commandFailed } + if strongSelf.isPlaying() { + strongSelf.pause() } else { - self?.play(allowSeekBack: true) + strongSelf.play(allowSeekBack: true) } return .success } commandCenter.pauseCommand.isEnabled = true commandCenter.pauseCommand.addTarget { [weak self] event in - if (self!.isPlaying()) { - self?.pause() + guard let strongSelf = self else { return .commandFailed } + if strongSelf.isPlaying() { + strongSelf.pause() } else { - self?.play(allowSeekBack: true) + strongSelf.play(allowSeekBack: true) } return .success } commandCenter.togglePlayPauseCommand.isEnabled = true commandCenter.togglePlayPauseCommand.addTarget { [weak self] event in - if (self!.isPlaying()) { - self?.pause() + guard let strongSelf = self else { return .commandFailed } + if strongSelf.isPlaying() { + strongSelf.pause() } else { - self?.play(allowSeekBack: true) + strongSelf.play(allowSeekBack: true) } return .success }