Merge pull request #309 from birdmichael/master

fix #67 fix showSubtile bug
BrikerMan · Jul 1, 2020 · f84c675 · f84c675
2 parents 8c7f1bf + b2679b9
commit f84c675
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Source/BMPlayerControlView.swift b/Source/BMPlayerControlView.swift
@@ -128,9 +128,7 @@ open class BMPlayerControlView: UIView {
         currentTimeLabel.text = BMPlayer.formatSecondsToString(currentTime)
         totalTimeLabel.text   = BMPlayer.formatSecondsToString(totalTime)
         timeSlider.value      = Float(currentTime) / Float(totalTime)
-        if let subtitle = resource?.subtitle {
-            showSubtile(from: subtitle, at: currentTime)
-        }
+        showSubtile(from: resource?.subtitle, at: currentTime)
     }
 
 
@@ -447,8 +445,8 @@ open class BMPlayerControlView: UIView {
 
 
     // MARK: - private functions
-    fileprivate func showSubtile(from subtitle: BMSubtitles, at time: TimeInterval) {
-        if let group = subtitle.search(for: time) {
+    fileprivate func showSubtile(from subtitle: BMSubtitles?, at time: TimeInterval) {
+        if let subtitle = subtitle, let group = subtitle.search(for: time) {
             subtitleBackView.isHidden = false
             subtitleLabel.attributedText = NSAttributedString(string: group.text,
                                                               attributes: subtileAttribute)