Skip to content

Commit da3769b

Browse files
author
aalonsog
committed
Updated chrome versions
1 parent e90c61e commit da3769b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

erizo_controller/erizoClient/src/Connection.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Erizo.Connection = function (spec) {
1616
if (typeof module !== 'undefined' && module.exports) {
1717
L.Logger.error('Publish/subscribe video/audio streams not supported in erizofc yet');
1818
that = Erizo.FcStack(spec);
19-
} else if (window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "26" ||
20-
window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "27") {
19+
} else if (window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "27" ||
20+
window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "28") {
2121
// Google Chrome Stable.
2222
console.log("Stable!");
2323
that = Erizo.ChromeStableStack(spec);

erizo_controller/erizoClient/src/Stream.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Erizo.Stream = function (spec) {
101101

102102
that.show = function (elementID, options) {
103103
that.elementID = elementID;
104-
if (that.hasVideo()) {
104+
if (that.hasVideo() || this.hasScreen()) {
105105
// Draw on HTML
106106
if (elementID !== undefined) {
107107
var player = new Erizo.VideoPlayer({id: that.getID(), stream: that, elementID: elementID, options: options});

erizo_controller/erizoController/erizoController.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ var listen = function () {
291291

292292
sendMsgToRoom(socket.room, 'onRemoveStream', {id: streamId});
293293

294-
if (socket.room.streams[streamId].hasAudio() || socket.room.streams[streamId].hasVideo()) {
294+
if (socket.room.streams[streamId].hasAudio() || socket.room.streams[streamId].hasVideo() || socket.room.streams[streamId].hasScreen()) {
295295
socket.state = 'sleeping';
296296
socket.room.webRtcController.removePublisher(streamId);
297297
}
@@ -315,7 +315,7 @@ var listen = function () {
315315

316316
socket.room.streams[to].removeDataSubscriber(socket.id);
317317

318-
if (socket.room.streams[to].hasAudio() || socket.room.streams[to].hasVideo()) {
318+
if (socket.room.streams[to].hasAudio() || socket.room.streams[to].hasVideo() || socket.room.streams[to].hasScreen()) {
319319
socket.room.webRtcController.removeSubscriber(socket.id, to);
320320
}
321321

@@ -350,7 +350,7 @@ var listen = function () {
350350
if (socket.streams.hasOwnProperty(i)) {
351351
id = socket.streams[i];
352352

353-
if (socket.room.streams[id].hasAudio() || socket.room.streams[id].hasVideo()) {
353+
if (socket.room.streams[id].hasAudio() || socket.room.streams[id].hasVideo() || socket.room.streams[id].hasScreen()) {
354354
socket.room.webRtcController.removeClient(socket.id, id);
355355
}
356356

0 commit comments

Comments
 (0)