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

fix close cam if it's not available

Browse Source
This commit is contained in:
Markos Calderon 2013-03-18 12:58:09 -05:00
parent 8731a43148
commit 9babc757fc
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-apps/build.gradle
View File

@ -97,7 +97,7 @@ dependencies {
//redis
compile 'redis.clients:jedis:2.0.0'
providedCompile 'commons:commons-pool:1.5.6'
providedCompile 'commons-pool:commons-pool:1.5.6'
// Libraries needed to run the scala tools
scalaTools 'org.scala-lang:scala-compiler:2.9.2'

12
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
View File

@ -210,10 +210,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function disableCamera():void {
_camera = null;
_video.attachCamera(null);
_video.clear();
_videoHolder.remove(_video);
_video = null;
if(_video != null){
_video.attachCamera(null);
_video.clear();
_videoHolder.remove(_video);
_video = null;
}
}
private function handleKeyDown(event:KeyboardEvent):void {
@ -245,7 +247,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
onCameraAccessAllowed();
// this is just to overwrite the message of waiting for approval
_videoHolder.showWarning('bbb.video.publish.hint.openingCamera');
} else if (e.code == "Camera.Muted") {
} else {//if (e.code == "Camera.Muted") {
onCameraAccessDisallowed();
}
}