fix video

iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -677,23 +677,25 @@ extension NCViewerImage: UIGestureRecognizerDelegate {
         
         if currentMetadata.typeFile == k_metadataTypeFile_video || currentMetadata.typeFile == k_metadataTypeFile_audio {
             
-            let currentSeekTime = player?.currentTime()
-            videoStop()
-            
             if pictureInPictureOcId != currentMetadata.ocId {
                 
                 // Kill PIP
                 appDelegate.activeViewerVideo?.player?.replaceCurrentItem(with: nil)
-
+                //
+                
                 appDelegate.activeViewerVideo = NCViewerVideo()
                 appDelegate.activeViewerVideo?.metadata = currentMetadata
-                appDelegate.activeViewerVideo?.seekTime = currentSeekTime
+                appDelegate.activeViewerVideo?.seekTime = player?.currentTime()
                 appDelegate.activeViewerVideo?.delegateViewerVideo = self
                 if let currentViewerVideo = appDelegate.activeViewerVideo {
                     present(currentViewerVideo, animated: false) { }
                 }
             }
             
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                self.videoStop()
+            }
+            
         } else {
                     
             if currentMode == .full {
@@ -726,17 +728,19 @@ extension NCViewerImage: NCViewerImageZoomDelegate {
         self.navigationController?.popViewController(animated: true)
     }
     
-    func presentImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
+    func willAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
+        videoStop()
+    }
+    
+    func didAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata) {
                 
         navigationItem.title = metadata.fileNameView
         currentMetadata = metadata
         currentViewerImageZoom = viewerImageZoom
         toolBar.isHidden = true
         
-        videoStop()
-
         if (currentMetadata.typeFile == k_metadataTypeFile_video || currentMetadata.typeFile == k_metadataTypeFile_audio) {
-            videoPlay(metadata: metadata)
+            //videoPlay(metadata: metadata)
             toolBar.isHidden = false
         }
             

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -24,7 +24,8 @@
 import UIKit
 
 protocol NCViewerImageZoomDelegate {
-    func presentImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata)
+    func didAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata)
+    func willAppearImageZoom(viewerImageZoom: NCViewerImageZoom, metadata: tableMetadata)
     func dismissImageZoom()
 }
 
@@ -97,6 +98,8 @@ class NCViewerImageZoom: UIViewController {
         
         updateZoomScale()
         centreConstraints()
+        
+        delegate?.willAppearImageZoom(viewerImageZoom: self, metadata: metadata)
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -109,7 +112,7 @@ class NCViewerImageZoom: UIViewController {
         updateZoomScale()
         centreConstraints()
         
-        delegate?.presentImageZoom(viewerImageZoom: self, metadata: metadata)
+        delegate?.didAppearImageZoom(viewerImageZoom: self, metadata: metadata)
     }
     
     override func viewDidLayoutSubviews() {