summaryrefslogtreecommitdiffstats
path: root/hacks/glx/cubetwist.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:41 +0100
committerSimon Rettberg2019-02-18 11:55:41 +0100
commitae69a754244c4e475c8d2591772ca8e005071d83 (patch)
tree58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /hacks/glx/cubetwist.c
parentUpdate gitignore (diff)
downloadxscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip
Update to 5.42
Diffstat (limited to 'hacks/glx/cubetwist.c')
-rw-r--r--hacks/glx/cubetwist.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hacks/glx/cubetwist.c b/hacks/glx/cubetwist.c
index 61af287..776e396 100644
--- a/hacks/glx/cubetwist.c
+++ b/hacks/glx/cubetwist.c
@@ -517,7 +517,7 @@ draw_cube (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glShadeModel(GL_SMOOTH);
glEnable(GL_DEPTH_TEST);
@@ -574,6 +574,8 @@ ENTRYPOINT void
free_cube (ModeInfo *mi)
{
cube_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
while (bp->cubes)
{
cube *c = bp->cubes->next;
@@ -587,6 +589,8 @@ free_cube (ModeInfo *mi)
free (bp->oscillators);
bp->oscillators = o;
}
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
}