Repository: openmeetings Updated Branches: refs/heads/master ecb78efdd -> 42c33d1be
[OPENMEETINGS-1646] more work on this issue Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/42c33d1b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/42c33d1b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/42c33d1b Branch: refs/heads/master Commit: 42c33d1be36e9a8fddc9475b837dc669f4bdd35f Parents: ecb78ef Author: Maxim Solodovnik <[email protected]> Authored: Wed Jun 28 17:19:42 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Jun 28 17:19:42 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/core/remote/ScopeApplicationAdapter.java | 2 +- .../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42c33d1b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java index cceaf2f..0a2cacd 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java @@ -702,7 +702,7 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp // Notify all clients of the same scope (room) sendMessageToCurrentScope("closeStream", rcl, rcl.isMobile()); if (rcl.isScreenClient()) { - WebSocketHelper.sendRoom(new TextRoomMessage(rcl.getRoomId(), rcl.getUserId(), RoomMessage.Type.closeStream, rcl.getPublicSID())); + WebSocketHelper.sendRoom(new TextRoomMessage(rcl.getRoomId(), rcl.getUserId(), RoomMessage.Type.sharingStoped, rcl.getPublicSID())); } } catch (Exception e) { log.error("[streamBroadcastClose]", e); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42c33d1b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index b84520e..f971dfc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -339,7 +339,7 @@ public class RoomPanel extends BasePanel { { String uid = ((TextRoomMessage)m).getText(); Client c = getOnlineClient(uid); - if (c == null || !c.hasActivity(Client.Activity.record)) { + if (c == null) { log.error("Not existing/BAD user has stopped recording {} != {} !!!!", uid); return; } @@ -365,7 +365,7 @@ public class RoomPanel extends BasePanel { { String uid = ((TextRoomMessage)m).getText(); Client c = getOnlineClient(uid); - if (c == null || !c.hasActivity(Client.Activity.share)) { + if (c == null) { log.error("Not existing user has started sharing {} !!!!", uid); return; }
