Browse Source

Fixes DS icon glow

master
hristoterezov 10 years ago
parent
commit
dbd24417c4
2 changed files with 18 additions and 13 deletions
  1. 15
    11
      conference.js
  2. 3
    2
      libs/lib-jitsi-meet.js

+ 15
- 11
conference.js View File

663
             APP.desktopsharing.toggleScreenSharing();
663
             APP.desktopsharing.toggleScreenSharing();
664
         });
664
         });
665
 
665
 
666
-        APP.UI.addListener(DSEvents.SWITCHING_DONE, (isSharingScreen) => {
666
+        APP.desktopsharing.addListener(DSEvents.SWITCHING_DONE,
667
+        (isSharingScreen) => {
667
             APP.UI.updateDesktopSharingButtons(isSharingScreen);
668
             APP.UI.updateDesktopSharingButtons(isSharingScreen);
668
         });
669
         });
669
 
670
 
675
         APP.desktopsharing.addListener(DSEvents.NEW_STREAM_CREATED,
676
         APP.desktopsharing.addListener(DSEvents.NEW_STREAM_CREATED,
676
             (track, callback) => {
677
             (track, callback) => {
677
                 const localCallback = (newTrack) => {
678
                 const localCallback = (newTrack) => {
678
-                    if(!newTrack)
679
+                    if(!newTrack || !newTrack.isLocal() ||
680
+                        newTrack !== localVideo)
679
                         return;
681
                         return;
680
-                    if (newTrack.isLocal() && newTrack === localVideo) {
681
-                        if(localVideo.isMuted() &&
682
-                           localVideo.videoType !== track.videoType) {
683
-                            localVideo.mute();
684
-                        }
685
-                        callback();
686
-                        room.off(ConferenceEvents.TRACK_ADDED, localCallback);
682
+                    if(localVideo.isMuted() &&
683
+                       localVideo.videoType !== track.videoType) {
684
+                        localVideo.mute();
687
                     }
685
                     }
686
+                    callback();
687
+                    if(room)
688
+                        room.off(ConferenceEvents.TRACK_ADDED, localCallback);
688
                 };
689
                 };
689
-
690
-                room.on(ConferenceEvents.TRACK_ADDED, localCallback);
690
+                if(room) {
691
+                    room.on(ConferenceEvents.TRACK_ADDED, localCallback);
692
+                }
691
                 localVideo.stop();
693
                 localVideo.stop();
692
                 localVideo = track;
694
                 localVideo = track;
693
                 addTrack(track);
695
                 addTrack(track);
696
+                if(!room)
697
+                    localCallback();
694
                 APP.UI.addLocalStream(track);
698
                 APP.UI.addLocalStream(track);
695
             }
699
             }
696
         );
700
         );

+ 3
- 2
libs/lib-jitsi-meet.js View File

1376
                 this._gumFailedHandler.forEach(function (handler) {
1376
                 this._gumFailedHandler.forEach(function (handler) {
1377
                     handler(error);
1377
                     handler(error);
1378
                 });
1378
                 });
1379
-                Statistics.sendGetUserMediaFailed(error);
1379
+                if(!this._gumFailedHandler.length)
1380
+                    Statistics.sendGetUserMediaFailed(error);
1380
                 if(error === JitsiTrackErrors.UNSUPPORTED_RESOLUTION) {
1381
                 if(error === JitsiTrackErrors.UNSUPPORTED_RESOLUTION) {
1381
                     var oldResolution = options.resolution || '360';
1382
                     var oldResolution = options.resolution || '360';
1382
                     var newResolution = getLowerResolution(oldResolution);
1383
                     var newResolution = getLowerResolution(oldResolution);
6589
  * /modules/settings/Settings.js
6590
  * /modules/settings/Settings.js
6590
  */
6591
  */
6591
 Statistics.prototype.startCallStats = function (session, settings) {
6592
 Statistics.prototype.startCallStats = function (session, settings) {
6592
-    if(this.callStatsIntegrationEnabled) {
6593
+    if(this.callStatsIntegrationEnabled && !this.callstats) {
6593
         this.callstats = new CallStats(session, settings, this.options);
6594
         this.callstats = new CallStats(session, settings, this.options);
6594
     }
6595
     }
6595
 }
6596
 }

Loading…
Cancel
Save