Updated Branches:
  refs/heads/develop 19af8933e -> d2768bef3

FLEX-33736 NullPointer exception in VideoDisplay


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/d2768bef
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d2768bef
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d2768bef

Branch: refs/heads/develop
Commit: d2768bef3de5e7f27a0ebc6acf3accfedb97b797
Parents: 19af893
Author: Justin Mclean <[email protected]>
Authored: Wed Sep 18 15:49:52 2013 +1000
Committer: Justin Mclean <[email protected]>
Committed: Wed Sep 18 15:49:52 2013 +1000

----------------------------------------------------------------------
 frameworks/projects/spark/src/spark/components/VideoDisplay.as | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d2768bef/frameworks/projects/spark/src/spark/components/VideoDisplay.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/VideoDisplay.as 
b/frameworks/projects/spark/src/spark/components/VideoDisplay.as
index 746b50e..8ca2e24 100644
--- a/frameworks/projects/spark/src/spark/components/VideoDisplay.as
+++ b/frameworks/projects/spark/src/spark/components/VideoDisplay.as
@@ -1961,7 +1961,8 @@ public class VideoDisplay extends UIComponent
             {
                 // second step
                 videoPlayer.muted = beforeLoadMuted;
-                videoPlayer.displayObject.visible = true;
+                               if (videoPlayer.displayObject)
+                       videoPlayer.displayObject.visible = true;
                 
                 // going to call pause() now to stop immediately
                 videoPlayer.pause();
@@ -1971,7 +1972,8 @@ public class VideoDisplay extends UIComponent
                 // third step
                 videoPlayer.removeEventListener(SeekEvent.SEEKING_CHANGE, 
videoPlayer_seekChangeHandler);
                 videoPlayer.muted = beforeLoadMuted;
-                videoPlayer.displayObject.visible = true;
+                               if (videoPlayer.displayObject)
+                       videoPlayer.displayObject.visible = true;
                 
                 // already called pause(), so don't do anything
             }

Reply via email to