From a6759a8171504c26d83b497f937eadcab546d3de Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Tue, 15 Oct 2013 14:51:02 +0000
Subject: [PATCH] - Fix issue
https://code.google.com/p/bigbluebutton/issues/detail?id=1653
---
.../org/bigbluebutton/modules/present/ui/views/SlideView.mxml | 4 ++--
.../bigbluebutton/modules/whiteboard/models/Presentation.as | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
index 760f9f24dd..ab80bef3b7 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
@@ -72,7 +72,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.modules.present.managers.Slide;
import org.bigbluebutton.modules.present.ui.views.models.SlideCalcUtil;
import org.bigbluebutton.modules.present.ui.views.models.SlideViewModel;
- import org.bigbluebutton.util.i18n.ResourceUtil;
+ import org.bigbluebutton.util.i18n.ResourceUtil;
[Bindable] public var zoomPercentage:Number = 100;
public static const ZOOM_STEP:int = 5;
@@ -94,7 +94,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var whiteboardCanvasHolder:Canvas = new Canvas();
private var whiteboardCanvas:IBbbCanvas;
- [Bindable] public var slides:ArrayCollection;
+ [Bindable] public var slides:ArrayCollection = new ArrayCollection();
[Bindable] public var selectedSlide:int=0;
[Bindable] private var lateComerSynched:Boolean = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/Presentation.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/Presentation.as
index d3772ce343..f88c6f4ac3 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/Presentation.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/Presentation.as
@@ -41,7 +41,11 @@ package org.bigbluebutton.modules.whiteboard.models
}
public function getAnnotation(id:String):Annotation {
+ if (_currentPage != null) {
return _currentPage.getAnnotation(id);
+ }
+
+ return null;
}
private function createPages(numPages:int):void {
--
GitLab