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/geodesicgears.c | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/geodesicgears.c')
-rw-r--r-- | hacks/glx/geodesicgears.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/hacks/glx/geodesicgears.c b/hacks/glx/geodesicgears.c index ecc7f26..3911b38 100644 --- a/hacks/glx/geodesicgears.c +++ b/hacks/glx/geodesicgears.c @@ -1325,7 +1325,7 @@ reshape_geodesic (ModeInfo *mi, int width, int height) h = height / (GLfloat) width; } - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); glViewport (0, y, (GLint) width, (GLint) height); @@ -1527,7 +1527,7 @@ draw_geodesic (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); if (bp->draw_time == 0) @@ -1790,11 +1790,13 @@ free_geodesic (ModeInfo *mi) geodesic_configuration *bp = &bps[MI_SCREEN(mi)]; if (!bp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); - free_texture_font (bp->font); - free (bp->colors); - free_sphere_gears (mi); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); + if (bp->font) free_texture_font (bp->font); + if (bp->colors) free (bp->colors); + if (mi) free_sphere_gears (mi); if (bp->desc) free (bp->desc); + if (bp->trackball) gltrackball_free (bp->trackball); + if (bp->rot) free_rotator (bp->rot); } |