summaryrefslogtreecommitdiffstats
path: root/hacks/glx/b_lockglue.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/b_lockglue.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/b_lockglue.c')
-rw-r--r--hacks/glx/b_lockglue.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hacks/glx/b_lockglue.c b/hacks/glx/b_lockglue.c
index 1bb1e67..d134a66 100644
--- a/hacks/glx/b_lockglue.c
+++ b/hacks/glx/b_lockglue.c
@@ -195,7 +195,7 @@ draw_bubble3d(ModeInfo * mi)
if (!c->glx_context)
return;
- glXMakeCurrent(display, window, *(c->glx_context));
+ glXMakeCurrent(display, window, *c->glx_context);
glb_config.polygon_count = 0;
glPushMatrix();
@@ -231,8 +231,9 @@ ENTRYPOINT void
free_bubble3d(ModeInfo * mi)
{
struct context *c = &contexts[MI_SCREEN(mi)];
- if (c->draw_context)
- glb_draw_end(c->draw_context);
+ if (!c->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *c->glx_context);
+ if (c->draw_context) glb_draw_end(c->draw_context);
}
XSCREENSAVER_MODULE ("Bubble3D", bubble3d)