BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into development

Browse Source
This commit is contained in:
Richard Alam 2015-07-28 18:52:46 +00:00
commit 667a619c4a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PollApp.scala
View File

@ -68,6 +68,9 @@ trait PollApp {
val shape = new scala.collection.mutable.HashMap[String, Object]()
shape += "num_respondents" -> new Integer(result.numRespondents)
shape += "num_responders" -> new Integer(result.numResponders)
shape += "type" -> "poll_result"
shape += "id" -> result.id
shape += "status" -> "DRAW_END"
val answers = new ArrayBuffer[java.util.HashMap[String, Object]];
result.answers.foreach(ans => {

4
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
View File

@ -111,13 +111,13 @@ package org.bigbluebutton.modules.videoconf.business
if (reconnect) {
JSLog.warn("NetStream.Play.Failed from bbb-video", logData);
}
disconnect();
//disconnect();
break;
case "NetStream.Play.Stop":
if (reconnect) {
JSLog.warn("NetStream.Play.Stop from bbb-video", logData);
}
disconnect();
//disconnect();
break;
case "NetConnection.Connect.Closed":
if (reconnect) {