You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/11/09 13:36:37 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1649] display
video seems to be fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 56f12fc [OPENMEETINGS-1649] display video seems to be fixed
56f12fc is described below
commit 56f12fc14e5226c897a5d734513195e713d72bd8
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Nov 9 20:36:18 2018 +0700
[OPENMEETINGS-1649] display video seems to be fixed
---
.../src/main/java/org/apache/openmeetings/db/entity/basic/Client.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index d4f5375..1d8dc0e 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -434,7 +434,7 @@ public class Client implements IDataProviderEntity, IWsClient {
public StreamDesc(StreamType type, Activity...activities) {
this.uuid = randomUUID().toString();
this.type = type;
- if (activities == null) {
+ if (activities == null || activities.length == 0) {
setActivities();
} else {
sactivities.addAll(Arrays.asList(activities));
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 9cec139..a7322cd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -170,7 +170,7 @@ var Video = (function() {
rtcPeer = new kurentoUtils.WebRtcPeer.WebRtcPeerRecvonly(
options
, function(error) {
- if (error) {
+ if (!this.cleaned && error) {
return OmUtil.error(error);
}
this.generateOffer(function(error, offerSdp) {