From 31dd23cb0d18d374ef53bf58b4abec12b58f4148 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 13 Dec 2013 10:24:54 -0700 Subject: [PATCH] fixed potential null pointer bug --- libobs-opengl/gl-subsystem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libobs-opengl/gl-subsystem.c b/libobs-opengl/gl-subsystem.c index df339916d..107d40ad1 100644 --- a/libobs-opengl/gl-subsystem.c +++ b/libobs-opengl/gl-subsystem.c @@ -247,10 +247,9 @@ void device_load_texture(device_t device, texture_t tex, int unit) if (!gl_active_texture(GL_TEXTURE0 + unit)) goto fail; - if (cur_tex && cur_tex->gl_target != tex->gl_target) + if (!tex || (cur_tex && cur_tex->gl_target != tex->gl_target)) gl_bind_texture(cur_tex->gl_target, 0); - device->cur_textures[unit] = tex; param = get_texture_param(device, unit); if (!param)