Merge remote-tracking branch 'upstream/develop' into feature/muting

2021-07-27 18:14:23 +02:00
parent 371de23b00 e7151ebf2d
commit bc11e215b8
1 changed files with 4 additions and 1 deletions
--- a/src/components/views/voip/VideoFeed.tsx
+++ b/src/components/views/voip/VideoFeed.tsx
@@ -80,7 +80,10 @@ export default class VideoFeed extends React.Component<IProps, IState> {
    }

    private setElementRef = (element: HTMLVideoElement): void => {
-        if (!element) element.removeEventListener('resize', this.onResize);
+        if (!element) {
+            this.element?.removeEventListener('resize', this.onResize);
+            return;
+        }

        this.element = element;
        element.addEventListener('resize', this.onResize);