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

Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel

Browse Source
This commit is contained in:
Leif Jackson 2010-06-29 05:07:00 +00:00
parent 9decad03c6
commit e67070cac5
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-client/src/org/bigbluebutton/main/model/BbbModuleManager.as
View File

@ -187,6 +187,10 @@ package org.bigbluebutton.main.model
if (m != null) {
LogUtil.debug('Starting ' + name);
var bbb:IBigBlueButtonModule = m.module as IBigBlueButtonModule;
if(bbb == null) {
LogUtil.debug('Module ' + name + ' was null skipping');
return;
}
bbb.acceptRouter(_router);
if (_user != null) {
m.addAttribute("conference", _user.conference);
@ -221,7 +225,11 @@ package org.bigbluebutton.main.model
if (m != null) {
LogUtil.debug('Stopping ' + name);
var bbb:IBigBlueButtonModule = m.module as IBigBlueButtonModule;
bbb.stop();
if(bbb == null) { //Still has null object refrence on logout sometimes.
LogUtil.debug('Module ' + name + ' was null skipping');
return;
}
bbb.stop();
}
}

2
bigbluebutton-client/src/org/bigbluebutton/modules/listeners/view/components/ListenerItem.mxml
View File

@ -108,7 +108,7 @@
</mx:states>
<mx:Button id="muteBtn" width="18" height="16" visible="true" enabled="{data.moderator}"
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.muteUnmute.toolTip')}"
toolTip="{data.moderator ? ResourceUtil.getInstance().getString('bbb.listenerItem.muteUnmute.toolTip') : ''}"
icon="{data.muted ? muteIcon : unmuteIcon}" click="muteUser()"/>
<mx:Label id="nameLabel" textAlign="left" text="{data.callerName}" width="145"
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.nameLbl.toolTip')}"/>

2
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
View File

@ -106,7 +106,7 @@ class PublicScheduledSessionController {
}
def signIn = {
if (params.fullname.trim() == "") {
if (params.fullname == null || params.fullname.trim() == "") {
log.debug "USer entered a blank name"
flash.message = "Please enter your name."
render(view:"joinIn", model: [id:params.id, fullname:params.fullname])

1
deskshare/vm-build.sh Normal file
View File

@ -0,0 +1 @@
gradle copyToLib war deploy