From 96ae8202621dfa1f7ae4995e7749d1b0d9918b54 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 7 Apr 2012 16:02:17 +0200
Subject: GLMediaPlayer: Fix destruction (NPE) / Fix MovieSimple shader, no
 GL_OES_EGL_image_external for plain ES2.

---
 src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/jogl/classes/jogamp')

diff --git a/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java b/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java
index df4cc7625..f6fc20afe 100644
--- a/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java
+++ b/src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java
@@ -279,9 +279,11 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer {
     protected void removeAllImageTextures(GLContext ctx) {
         if(null != texFrames) {
             for(int i=0; i<textureCount; i++) {
-                final TextureFrame imgTex = texFrames[i]; 
-                destroyTexImage(ctx, imgTex);
-                texFrames[i] = null;
+                final TextureFrame imgTex = texFrames[i];
+                if(null != imgTex) {
+                    destroyTexImage(ctx, imgTex);
+                    texFrames[i] = null;
+                }
             }
         }
         texFrameMap.clear();
-- 
cgit v1.2.3