Permalink
Browse files

Merge pull request #41 from mconf/issue-1229

  • Loading branch information...
ritzalam committed May 24, 2012
2 parents c1a5972 + 2a5023b commit ab35e0c81ec743dad615d5e5abca9f4b8362a224
@@ -68,7 +68,7 @@
// the auto-publishing until after the Viewers's window has loaded
// to receive the publishing events. Otherwise, the user joining next
// won't be able to view the webcam.
- private var autoPublishTimer:Timer;
+ private var autoPublishTimer:Timer = null;
// Timer used to enable the start publishing button, only after get
// any activity on the camera. It avoids the problem of publishing
@@ -234,6 +234,9 @@
private function startPublishing():void{
if (_camera == null) return;
+ if (autoPublishTimer != null)
+ autoPublishTimer.stop();
+
showWarning('bbb.video.publish.hint.publishing', true, "0xFFFF00");
defaultWidth = originalWidth;
@@ -21,6 +21,7 @@
-->
<mx:Button xmlns:mx="http://www.adobe.com/2006/mxml" icon="{camIcon}"
+ xmlns:mate="http://mate.asfusion.com/"
click="openPublishWindow()" creationComplete="init()"
toolTip="{ResourceUtil.getInstance().getString('bbb.toolbar.video.toolTip')}"
visible="{isPresenter}"
@@ -48,8 +49,6 @@
private function openPublishWindow():void{
dispatchEvent(new OpenPublishWindowEvent());
- this.enabled = false;
- camIcon = images.webcam;
}
public function show():void{
@@ -62,4 +61,6 @@
}
]]>
</mx:Script>
+
+ <mate:Listener type="{OpenPublishWindowEvent.OPEN_PUBLISH_WINDOW}" receive="enabled=false" />
</mx:Button>

0 comments on commit ab35e0c

Please sign in to comment.