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/hydrostat.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/hydrostat.c')
| -rw-r--r-- | hacks/glx/hydrostat.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/hacks/glx/hydrostat.c b/hacks/glx/hydrostat.c index faf15a0..99bc6cd 100644 --- a/hacks/glx/hydrostat.c +++ b/hacks/glx/hydrostat.c @@ -754,7 +754,7 @@ draw_hydrostat (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); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -797,11 +797,21 @@ free_hydrostat (ModeInfo *mi) { hydrostat_configuration *bp = &bps[MI_SCREEN(mi)]; int i; - if (!bp->squids) - return; - for (i = 0; i < MI_COUNT(mi); i++) - free_squid (bp->squids[i]); - free (bp->squids); + + if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context); + +# ifdef USE_TRACKBALL + if (bp->trackball) gltrackball_free (bp->trackball); +# endif + if (bp->squids) + { + for (i = 0; i < MI_COUNT(mi); i++) + free_squid (bp->squids[i]); + free (bp->squids); + } + + if (glIsList(bp->head)) glDeleteLists(bp->head, 1); } XSCREENSAVER_MODULE ("Hydrostat", hydrostat) |