[OPENMEETINGS-1595] video off/on should work better
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4df09e53 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4df09e53 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4df09e53 Branch: refs/heads/3.2.x Commit: 4df09e53bee1256b9d5d34848d49d64a584a4974 Parents: 5d4504e Author: Maxim Solodovnik <[email protected]> Authored: Thu Mar 16 04:36:08 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Mar 16 04:36:08 2017 +0000 ---------------------------------------------------------------------- .../core/remote/red5/ScopeApplicationAdapter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4df09e53/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java index b00e9a7..ab5f776 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java @@ -789,9 +789,11 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp log.debug("*** +++++++ ######## sendClientBroadcastNotifications Any Client is Recording - stop that"); recordingService.stopRecordingShowForClient(current.getScope(), rcl); } - rcl.setBroadCastID(-1); - rcl.setIsBroadcasting(false); - rcl.setAvsettings("n"); + if (stream.getPublishedName().equals("" + rcl.getBroadCastID())) { + rcl.setBroadCastID(-1); + rcl.setIsBroadcasting(false); + rcl.setAvsettings("n"); + } sessionManager.updateClientByStreamId(streamId, rcl, false, null); // Notify all clients of the same scope (room) sendMessageToCurrentScope("closeStream", rcl, rcl.isMobile());
