Merge branch 'master' into speedups2

1 files changed, 3 insertions, 3 deletions

diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index 036b3ba14..33fdc4935 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -120,7 +120,7 @@ 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.updateTimecode();
+        this.props.renderDepth !== -1 && this.updateTimecode();
     }
 
     @action public FullScreen = () => {
@@ -538,8 +538,8 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
                 trimStart={0}
                 trimEnd={this.duration}
                 trimDuration={this.duration}
-                setStartTrim={() => { }}
-                setEndTrim={() => { }}
+                setStartTrim={emptyFunction}
+                setEndTrim={emptyFunction}
             />
         </div>;
     }