summaryrefslogtreecommitdiffstats
path: root/hacks/glx/razzledazzle.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:58 +0100
committerSimon Rettberg2019-02-18 11:55:58 +0100
commitaa7530630e595b80d5db54655fd827b61edc0fd7 (patch)
tree048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/razzledazzle.c
parentForgot one DPMS killing instance (diff)
parentUpdate to 5.42 (diff)
downloadxscreensaver-23.tar.gz
xscreensaver-23.tar.xz
xscreensaver-23.zip
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/razzledazzle.c')
-rw-r--r--hacks/glx/razzledazzle.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hacks/glx/razzledazzle.c b/hacks/glx/razzledazzle.c
index a3c8f98..4c940d1 100644
--- a/hacks/glx/razzledazzle.c
+++ b/hacks/glx/razzledazzle.c
@@ -571,7 +571,7 @@ draw_dazzle (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);
glDisable(GL_DEPTH_TEST);
@@ -709,6 +709,10 @@ ENTRYPOINT void
free_dazzle (ModeInfo *mi)
{
dazzle_configuration *bp = &bps[MI_SCREEN(mi)];
+
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+
if (bp->nodes) free (bp->nodes);
if (bp->colors) free (bp->colors);
if (bp->dlists)