diff options
| author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
| commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
| tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/hexstrut.c | |
| parent | Forgot one DPMS killing instance (diff) | |
| parent | Update to 5.42 (diff) | |
| download | xscreensaver-23.tar.gz xscreensaver-23.tar.xz xscreensaver-23.zip | |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/hexstrut.c')
| -rw-r--r-- | hacks/glx/hexstrut.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hacks/glx/hexstrut.c b/hacks/glx/hexstrut.c index a547a76..ba76d86 100644 --- a/hacks/glx/hexstrut.c +++ b/hacks/glx/hexstrut.c @@ -450,7 +450,7 @@ draw_hexstrut (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); @@ -496,6 +496,13 @@ ENTRYPOINT void free_hexstrut (ModeInfo *mi) { hexstrut_configuration *bp = &bps[MI_SCREEN(mi)]; + + if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); + + if (bp->trackball) gltrackball_free (bp->trackball); + if (bp->rot) free_rotator (bp->rot); + if (bp->colors) free (bp->colors); while (bp->triangles) { triangle *t = bp->triangles->next; |