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/circuit.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/circuit.c')
-rw-r--r-- | hacks/glx/circuit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/hacks/glx/circuit.c b/hacks/glx/circuit.c index 744e4b6..b8b845e 100644 --- a/hacks/glx/circuit.c +++ b/hacks/glx/circuit.c @@ -2072,7 +2072,7 @@ ENTRYPOINT void draw_circuit(ModeInfo *mi) if (!ci->glx_context) return; - glXMakeCurrent(disp, w, *(ci->glx_context)); + glXMakeCurrent(disp, w, *ci->glx_context); display(mi); @@ -2084,8 +2084,12 @@ ENTRYPOINT void draw_circuit(ModeInfo *mi) ENTRYPOINT void free_circuit(ModeInfo *mi) { Circuit *ci = &circuit[MI_SCREEN(mi)]; - if (ci->font) - free_texture_font (ci->font); + int i; + if (!ci->glx_context) return; + glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *ci->glx_context); + if (ci->font) free_texture_font (ci->font); + for (i = 0 ; i < 12 ; i++) + if (glIsList(ci->band_list[i])) glDeleteLists(ci->band_list[i], 1); FreeAllGL(mi); } |