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/flipflop.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/flipflop.c')
-rw-r--r-- | hacks/glx/flipflop.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hacks/glx/flipflop.c b/hacks/glx/flipflop.c index c26458c..fe1643b 100644 --- a/hacks/glx/flipflop.c +++ b/hacks/glx/flipflop.c @@ -456,7 +456,7 @@ draw_flipflop(ModeInfo *mi) if(!c->glx_context || (textured && !c->got_texture)) return; - glXMakeCurrent(disp, w, *(c->glx_context)); + glXMakeCurrent(disp, w, *c->glx_context); mi->polygon_count = display(mi); @@ -474,10 +474,14 @@ ENTRYPOINT void free_flipflop(ModeInfo *mi) { Flipflopcreen *c = &qs[MI_SCREEN(mi)]; + if (!c->glx_context) return; + glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *c->glx_context); + if(c->trackball) gltrackball_free(c->trackball); if (c->sheet) { randsheet_free(c->sheet); free (c->sheet); } + if (c->texid) glDeleteTextures (1, &c->texid); } /*** ADDED RANDSHEET FUNCTIONS ***/ |