From fce5f01e669ba53492a61cfe705fa76a44fc2fab Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Wed, 28 Jun 2023 15:51:48 +0200
Subject: [PATCH] Various fixes

---
 .../Sources/MediaEditorRenderer.swift         |  5 +-
 .../Sources/MediaEditorScreen.swift           | 57 +------------------
 2 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorRenderer.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorRenderer.swift
index d1b9e79cd7..5b120f5477 100644
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorRenderer.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorRenderer.swift
@@ -304,7 +304,10 @@ final class MediaEditorRenderer: TextureConsumer {
         self.willRenderFrame()
         
         self.currentPixelBuffer = pixelBuffer
-        self.currentAdditionalPixelBuffer = additionalPixelBuffer
+        if additionalPixelBuffer == nil && self.currentAdditionalPixelBuffer != nil {
+        } else {
+            self.currentAdditionalPixelBuffer = additionalPixelBuffer
+        }
         if render {
             if self.previousPresentationTimestamp == pixelBuffer.timestamp {
                 self.didRenderFrame()
diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
index 4564cd8a26..e092ceef84 100644
--- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
+++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
@@ -1910,63 +1910,8 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
                     }
                 }
             }
-            
-            if case .video = subject {
-                self.playbackPositionDisposable = (mediaEditor.position
-                |> deliverOnMainQueue).start(next: { [weak self] position in
-                    if let self {
-                        self.updateVideoPlaybackPosition(position: position)
-                    }
-                })
-            }
         }
-        
-        private var additionalIsMainstage = false
-        private func updateVideoPlaybackPosition(position: CGFloat) {
-            guard let subject = self.subject, case let .video(_, _, _, _, _, _, _, timestamps, _) = subject, !timestamps.isEmpty else {
-                return
-            }
-            var currentIsFront = false
-            for (isFront, timestamp) in timestamps {
-                if position < timestamp {
-                    break
-                }
-                currentIsFront = isFront
-            }
-            
-            self.additionalIsMainstage = currentIsFront
-            self.updateMainStageVideo()
-        }
-        
-        private func updateMainStageVideo() {
-            guard let mainEntityView = self.entitiesView.getView(where: { $0 is DrawingMediaEntityView }) as? DrawingMediaEntityView, let mainEntity = mainEntityView.entity as? DrawingMediaEntity else {
-                return
-            }
-            
-            let additionalEntityView = self.entitiesView.getView(where: { view in
-                if let stickerEntity =  view.entity as? DrawingStickerEntity, case .video = stickerEntity.content {
-                    return true
-                } else {
-                    return false
-                }
-            }) as? DrawingStickerEntityView
-            
-            var animated = true
-            if mainEntity.scale != 1.0 || mainEntity.rotation != 0.0 || mainEntity.position != CGPoint(x: storyDimensions.width / 2.0, y: storyDimensions.height / 2.0) {
-                animated = false
-            }
-            
-            let _ = animated
-            
-            if self.additionalIsMainstage {
-                mainEntityView.additionalView = additionalEntityView?.videoView
-                additionalEntityView?.mainView = mainEntityView.previewView
-            } else {
-                mainEntityView.additionalView = nil
-                additionalEntityView?.mainView = nil
-            }
-        }
-        
+       
         override func didLoad() {
             super.didLoad()