From cacf20f7bba14901b6dca9d1ce458d382c769144 Mon Sep 17 00:00:00 2001
From: mehekj <mehek.jethani@gmail.com>
Date: Sun, 20 Mar 2022 10:43:11 -0400
Subject: fix videobox merge issues

---
 src/client/views/nodes/VideoBox.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index 56cb562bc..c8e0cdb66 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -168,7 +168,8 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
         }
         this._youtubePlayer && SelectionManager.DeselectAll(); // if we don't deselect the player, then we get an annoying YouTube spinner I guess telling us we're paused.
         this._playTimer = undefined;
-        this.props.renderDepth !== -1 && this.updateTimecode();
+        this.updateTimecode();
+        if (!this._finished) clearTimeout(this._playRegionTimer);;
     }
 
     @action public FullScreen = () => {
@@ -700,12 +701,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
                 Pause={this.Pause}
                 playLink={this.playLink}
                 PanelHeight={this.timelineHeight}
-                trimming={false}
-                trimStart={0}
-                trimEnd={this.duration}
-                trimDuration={this.duration}
-                setStartTrim={emptyFunction}
-                setEndTrim={emptyFunction}
+                rawDuration={this.rawDuration}
             />
         </div>;
     }
-- 
cgit v1.2.3-70-g09d2