summaryrefslogtreecommitdiffstats
path: root/hacks/glx/stonerview.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:58 +0100
committerSimon Rettberg2019-02-18 11:55:58 +0100
commitaa7530630e595b80d5db54655fd827b61edc0fd7 (patch)
tree048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/stonerview.c
parentForgot one DPMS killing instance (diff)
parentUpdate to 5.42 (diff)
downloadxscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz
xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz
xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/stonerview.c')
-rw-r--r--hacks/glx/stonerview.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/hacks/glx/stonerview.c b/hacks/glx/stonerview.c
index 880ef01..ff4e131 100644
--- a/hacks/glx/stonerview.c
+++ b/hacks/glx/stonerview.c
@@ -101,7 +101,7 @@ draw_stonerview (ModeInfo *mi)
{
stonerview_configuration *bp = &bps[MI_SCREEN(mi)];
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glPushMatrix ();
glRotatef( current_device_rotation(), 0, 0, 1);
@@ -132,6 +132,9 @@ ENTRYPOINT void
free_stonerview (ModeInfo *mi)
{
stonerview_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->trackball) gltrackball_free (bp->trackball);
if (bp->st)
stonerview_win_release (bp->st);
}