From d1b1ffe675161841143a2a788f91809194939e42 Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Mon, 24 Apr 2017 17:57:37 -0400
Subject: [PATCH] fix whiteboard toolbar show hide animation so it interrupts

---
 .../modules/whiteboard/views/WhiteboardToolbar.mxml         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
index e9b98b7ecf..12b72a42b9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
@@ -280,6 +280,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             
 			private function showToolbar():void {
 				_hideToolbarTimer.reset();
+				if (fadeOut.isPlaying) {
+					fadeOut.end();
+				}
 				showWhiteboardToolbar = true;
 			}
 
@@ -289,6 +292,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 
 			private function onHideToolbarTimerComplete(event:TimerEvent):void {
+				if (fadeIn.isPlaying) {
+					fadeIn.end();
+				}
 				showWhiteboardToolbar = false;
 			}