From c896a5886c2e35d4d35e88ab2a786551fe43abbe Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Wed, 12 Feb 2020 03:06:42 +0400
Subject: [PATCH] Fixes

---
 .../Sources/Items/UniversalVideoGalleryItem.swift      | 10 ++++++++--
 submodules/MediaPlayer/Sources/MediaPlayer.swift       |  3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift
index 48431dbfea..f0b6c51d16 100644
--- a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift
+++ b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift
@@ -256,6 +256,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
     private var initiallyActivated = false
     private var hideStatusNodeUntilCentrality = false
     private var playOnContentOwnership = false
+    private var skipInitialPause = false
     private var validLayout: (ContainerViewLayout, CGFloat)?
     private var didPause = false
     private var isPaused = true
@@ -480,6 +481,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                     if strongSelf.playOnContentOwnership {
                         strongSelf.playOnContentOwnership = false
                         strongSelf.initiallyActivated = true
+                        strongSelf.skipInitialPause = true
                         strongSelf.videoNode?.playOnceWithSound(playAndRecord: false, actionAtEnd: .stop)
                     }
                 }
@@ -786,8 +788,12 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                 if hadPreviousValue {
                     videoNode.canAttachContent = isVisible
                     if isVisible {
-                        videoNode.pause()
-                        videoNode.seek(0.0)
+                        if self.skipInitialPause {
+                            self.skipInitialPause = false
+                        } else {
+                            videoNode.pause()
+                            videoNode.seek(0.0)
+                        }
                     } else {
                         videoNode.continuePlayingWithoutSound()
                     }
diff --git a/submodules/MediaPlayer/Sources/MediaPlayer.swift b/submodules/MediaPlayer/Sources/MediaPlayer.swift
index d57c7d5366..9f3ab99e65 100644
--- a/submodules/MediaPlayer/Sources/MediaPlayer.swift
+++ b/submodules/MediaPlayer/Sources/MediaPlayer.swift
@@ -530,8 +530,7 @@ private final class MediaPlayerContext {
         } else {
             if case let .timecode(time) = seek {
                 self.seek(timestamp: Double(time), action: .play)
-            }
-            else if case .playing = self.state {
+            } else if case .playing = self.state {
             } else {
                 self.play()
             }