Merge branch 'release/6.1.2'

SRGSSR · Jan 6, 2021 · 7ba6b8f · 7ba6b8f
2 parents 86d55f9 + 516ebc2
commit 7ba6b8f
Show file tree

Hide file tree

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

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

diff --git a/Sources/SRGMediaPlayer/SRGPictureInPictureFix.m b/Sources/SRGMediaPlayer/SRGPictureInPictureFix.m
@@ -48,14 +48,14 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification
         // Somehow Apple manages to circumvent this issue internally with `AVPlayerViewController` which, if
         // displayed once, ensures proper behavior afterwards.
         SRGDummyPlayerViewController *playerViewController = [[SRGDummyPlayerViewController alloc] init];
-        playerViewController.modalPresentationStyle = UIModalPresentationOverCurrentContext;
-        playerViewController.definesPresentationContext = NO;
         playerViewController.player = [AVPlayer new];
 
-        UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
-        [rootViewController presentViewController:playerViewController animated:NO completion:^{
-            [rootViewController dismissViewControllerAnimated:NO completion:nil];
-        }];
+        UIView *playerView = playerViewController.view;
+        UIWindow *keyWindow = UIApplication.sharedApplication.keyWindow;
+        [keyWindow addSubview:playerView];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [playerView removeFromSuperview];
+        });
     });
 }