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

Fix flash null exceptions.

Browse Source
This commit is contained in:
Ghazi Triki 2018-06-06 17:23:48 +01:00
parent a1cac0bfb9
commit 28e67148ad
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
View File

@ -280,7 +280,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function showNotification():void {
if (parent.visible) {
if (parent && parent.visible) {
visible = includeInLayout = true;
if (notificationTimer.running) notificationTimer.reset();

6
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
View File

@ -444,13 +444,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function goToPreviousSlide():void {
if (PresentationModel.getInstance().getCurrentPage().num > 1) {
var curPage:Page = PresentationModel.getInstance().getCurrentPage();
if (curPage != null && curPage.num > 1) {
dispatchEvent(new GoToPrevPageCommand());
}
}
private function goToNextSlide():void {
if (PresentationModel.getInstance().getCurrentPage().num < PresentationModel.getInstance().getNumberOfPages()) {
var curPage:Page = PresentationModel.getInstance().getCurrentPage();
if (curPage != null && curPage.num < PresentationModel.getInstance().getNumberOfPages()) {
dispatchEvent(new GoToNextPageCommand());
}
}

1
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
View File

@ -60,7 +60,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.modules.present.events.DisplaySlideEvent;
import org.bigbluebutton.modules.present.events.PageChangedEvent;
import org.bigbluebutton.modules.present.events.PageLoadedEvent;
import org.bigbluebutton.modules.present.events.PresenterCommands;
import org.bigbluebutton.modules.present.model.Page;
import org.bigbluebutton.modules.present.model.PagePositionBroadcaster;
import org.bigbluebutton.modules.present.model.Presentation;

2
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as
View File

@ -57,7 +57,7 @@ package org.bigbluebutton.modules.sharednotes.maps
LOGGER.debug("NoteId:" + id +":"+e.document[id] + ":" + e.type);
if (id != window.noteId && !windows.hasOwnProperty(id)) {
createAdditionalNotes(id, "");
windows[id].addRemoteDocument(e.document, e.isNotesLimit);
SharedNotesWindow(windows[id]).addRemoteDocument(e.document, e.isNotesLimit);
}
}

6
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
View File

@ -44,6 +44,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import mx.core.UIComponent;
import org.as3commons.lang.StringUtils;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.common.Role;
@ -142,7 +143,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
public function loadAvatar(options:VideoConfOptions):void {
avatar.user = _user;
avatar.options = options;
avatar.load(UsersUtil.getUserAvatarURL(_user.intId));
var userAvatar : String = UsersUtil.getUserAvatarURL(_user.intId);
if (!StringUtils.isEmpty(userAvatar)) {
avatar.load(userAvatar);
}
avatarVisibility = true;
setUserProperties();