aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-04-07 16:02:17 +0200
committerSven Gothel <[email protected]>2012-04-07 16:02:17 +0200
commit96ae8202621dfa1f7ae4995e7749d1b0d9918b54 (patch)
tree5095ed81de9a3adb8b8f009089fc463c1960d0a8 /src/jogl/classes/jogamp
parentd1460514789288ad550cb7c8ea627da5f49eec07 (diff)
GLMediaPlayer: Fix destruction (NPE) / Fix MovieSimple shader, no GL_OES_EGL_image_external for plain ES2.
Diffstat (limited to 'src/jogl/classes/jogamp')
-rw-r--r--src/jogl/classes/jogamp/opengl/av/GLMediaPlayerImpl.java8
1 files changed, 5 insertions, 3 deletions
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();