From a7ac7790a882d2601b27c432937dfdcf7b1aa7f7 Mon Sep 17 00:00:00 2001
From: Hristo Terezov <hristo@jitsi.org>
Date: Tue, 25 Feb 2020 16:54:20 +0000
Subject: [PATCH] fix(avatars): optimise

---
 modules/UI/videolayout/RemoteVideo.js |  1 +
 modules/UI/videolayout/SmallVideo.js  | 16 +---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js
index 89d4d24d2..c6fdd2384 100644
--- a/modules/UI/videolayout/RemoteVideo.js
+++ b/modules/UI/videolayout/RemoteVideo.js
@@ -126,6 +126,7 @@ export default class RemoteVideo extends SmallVideo {
     addRemoteVideoContainer() {
         this.container = createContainer(this.videoSpanId);
         this.$container = $(this.container);
+        this.initializeAvatar();
         this._setThumbnailSize();
         this.initBrowserSpecificProperties();
         this.updateRemoteVideoMenu();
diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js
index ca08711ce..6fa117656 100644
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -83,7 +83,6 @@ export default class SmallVideo {
      */
     constructor(VideoLayout) {
         this.isAudioMuted = false;
-        this.hasAvatar = false;
         this.isVideoMuted = false;
         this.videoStream = null;
         this.audioStream = null;
@@ -518,20 +517,9 @@ export default class SmallVideo {
     }
 
     /**
-     * Hides or shows the user's avatar.
-     * This update assumes that large video had been updated and we will
-     * reflect it on this small video.
+     * Updates the css classes of the thumbnail based on the current state.
      */
     updateView() {
-        if (this.id) {
-            // Init / refresh avatar
-            this.initializeAvatar();
-        } else {
-            logger.error('Unable to init avatar - no id', this);
-
-            return;
-        }
-
         this.$container.removeClass((index, classNames) =>
             classNames.split(' ').filter(name => name.startsWith('display-')));
 
@@ -581,8 +569,6 @@ export default class SmallVideo {
     initializeAvatar() {
         const thumbnail = this.$avatar().get(0);
 
-        this.hasAvatar = true;
-
         if (thumbnail) {
             // Maybe add a special case for local participant, as on init of
             // LocalVideo.js the id is set to "local" but will get updated later.