Browse Source

Fixes broken last-N

master
paweldomas 10 years ago
parent
commit
2f03a0a7fe
2 changed files with 9 additions and 3 deletions
  1. 1
    1
      modules/UI/videolayout/LocalVideo.js
  2. 8
    2
      modules/UI/videolayout/VideoLayout.js

+ 1
- 1
modules/UI/videolayout/LocalVideo.js View File

166
             event.stopPropagation();
166
             event.stopPropagation();
167
         }
167
         }
168
         self.VideoLayout.handleVideoThumbClicked(
168
         self.VideoLayout.handleVideoThumbClicked(
169
-            false,
169
+            true,
170
             APP.xmpp.myResource());
170
             APP.xmpp.myResource());
171
     }
171
     }
172
 
172
 

+ 8
- 2
modules/UI/videolayout/VideoLayout.js View File

681
                 lastNEndpoints.indexOf(resourceJid) < 0 &&
681
                 lastNEndpoints.indexOf(resourceJid) < 0 &&
682
                 localLastNSet.indexOf(resourceJid) < 0) {
682
                 localLastNSet.indexOf(resourceJid) < 0) {
683
                 console.log("Remove from last N", resourceJid);
683
                 console.log("Remove from last N", resourceJid);
684
-                remoteVideos[resourceJid].showPeerContainer('hide');
684
+                if (remoteVideos[resourceJid])
685
+                    remoteVideos[resourceJid].showPeerContainer('hide');
686
+                else if (APP.xmpp.myResource() !== resourceJid)
687
+                    console.error("No remote video for: " + resourceJid);
685
                 isReceived = false;
688
                 isReceived = false;
686
             } else if (resourceJid &&
689
             } else if (resourceJid &&
687
                 $('#participant_' + resourceJid).is(':visible') &&
690
                 $('#participant_' + resourceJid).is(':visible') &&
688
                 lastNEndpoints.indexOf(resourceJid) < 0 &&
691
                 lastNEndpoints.indexOf(resourceJid) < 0 &&
689
                 localLastNSet.indexOf(resourceJid) >= 0) {
692
                 localLastNSet.indexOf(resourceJid) >= 0) {
690
-                remoteVideos[resourceJid].showPeerContainer('avatar');
693
+                if (remoteVideos[resourceJid])
694
+                    remoteVideos[resourceJid].showPeerContainer('avatar');
695
+                else if (APP.xmpp.myResource() !== resourceJid)
696
+                    console.error("No remote video for: " + resourceJid);
691
                 isReceived = false;
697
                 isReceived = false;
692
             }
698
             }
693
 
699
 

Loading…
Cancel
Save