diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-07-23 18:55:27 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-07-23 18:55:27 -0400 |
| commit | c3febe151a34456cecbe84ffaac6eeea56254005 (patch) | |
| tree | 3e1465a0e195c3b9676513606089a3dd141b0176 /src/components/moments/TrimmerPlayer.tsx | |
| parent | 811426f6a4d2e3495d45c0ed1b209f2ea539e26f (diff) | |
| parent | e39fcbd9e35f6a5e36afe248e24bea0dd3859202 (diff) | |
Merge branch 'master' into tma994-bugfix-camera-screen-preview
# Conflicts:
# src/components/moments/TrimmerPlayer.tsx
# src/screens/upload/EditMedia.tsx
Diffstat (limited to 'src/components/moments/TrimmerPlayer.tsx')
| -rw-r--r-- | src/components/moments/TrimmerPlayer.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/moments/TrimmerPlayer.tsx b/src/components/moments/TrimmerPlayer.tsx index 247c270f..8d1cd156 100644 --- a/src/components/moments/TrimmerPlayer.tsx +++ b/src/components/moments/TrimmerPlayer.tsx @@ -75,9 +75,9 @@ const TrimmerPlayer: React.FC<TrimmerPlayerProps> = ({ setEnd(payload.duration); const {width, height} = payload.naturalSize; if (payload.naturalSize.orientation === 'portrait') { - handleLoad(height, width); + handleLoad(height, width, payload.duration); } else { - handleLoad(width, height); + handleLoad(width, height, payload.duration); } }} onProgress={(e) => { |