Merge branch 'release/7.2.3'

SRGSSR · Aug 4, 2024 · 354b2c5 · 354b2c5
2 parents cbf8cf3 + 3041e15
commit 354b2c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 7.2.2
+MARKETING_VERSION = 7.2.3
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "7.2.2"
+    static let marketingVersion: String = "7.2.3"
 }
 
 let package = Package(

diff --git a/Sources/SRGMediaPlayer/SRGMediaPlayerController.m b/Sources/SRGMediaPlayer/SRGMediaPlayerController.m
@@ -234,9 +234,12 @@ - (void)setPlayer:(SRGPlayer *)player
                     };
 
                     SRGTimePosition *startTimePosition = [self timePositionForPosition:self.startPosition inSegment:self.targetSegment applyEndTolerance:YES];
-                    [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:^(BOOL finished) {
-                        completionBlock(finished);
-                    }];
+                    if (CMTIME_COMPARE_INLINE(startTimePosition.time, !=, kCMTimeZero) || self.streamType == SRGMediaPlayerStreamTypeOnDemand) {
+                        [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:completionBlock];
+                    }
+                    else {
+                        completionBlock(YES);
+                    }
                 }
             }
             else if (playerItem.status == AVPlayerItemStatusFailed) {