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/romanboy.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/romanboy.c')
-rw-r--r-- | hacks/glx/romanboy.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/hacks/glx/romanboy.c b/hacks/glx/romanboy.c index 9ad12f0..e906082 100644 --- a/hacks/glx/romanboy.c +++ b/hacks/glx/romanboy.c @@ -1497,7 +1497,7 @@ ENTRYPOINT void draw_romanboy(ModeInfo *mi) if (!pp->glx_context) return; - glXMakeCurrent(display,window,*(pp->glx_context)); + glXMakeCurrent(display, window, *pp->glx_context); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); glLoadIdentity(); @@ -1524,14 +1524,15 @@ ENTRYPOINT void free_romanboy(ModeInfo *mi) { romanboystruct *pp = &romanboy[MI_SCREEN(mi)]; - if (pp->pp) - (void) free((void *)pp->pp); - if (pp->pn) - (void) free((void *)pp->pn); - if (pp->col) - (void) free((void *)pp->col); - if (pp->tex) - (void) free((void *)pp->tex); + if (!pp->glx_context) return; + glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *pp->glx_context); + + if (pp->pp) free(pp->pp); + if (pp->pn) free(pp->pn); + if (pp->col) free(pp->col); + if (pp->tex) free(pp->tex); + gltrackball_free (pp->trackball); + if (pp->tex_name) glDeleteTextures (1, &pp->tex_name); } #ifndef STANDALONE @@ -1542,7 +1543,7 @@ ENTRYPOINT void change_romanboy(ModeInfo *mi) if (!pp->glx_context) return; - glXMakeCurrent(MI_DISPLAY(mi),MI_WINDOW(mi),*(pp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *pp->glx_context); init(mi); } #endif /* !STANDALONE */ |