From ae69a754244c4e475c8d2591772ca8e005071d83 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Feb 2019 11:55:41 +0100
Subject: Update to 5.42

---
 hacks/glx/flurry.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'hacks/glx/flurry.c')

diff --git a/hacks/glx/flurry.c b/hacks/glx/flurry.c
index c9008a9..a236f52 100644
--- a/hacks/glx/flurry.c
+++ b/hacks/glx/flurry.c
@@ -90,6 +90,7 @@ ModStruct   flurry_description = {
 
 global_info_t *flurry_info = NULL;
 
+
 static
 double currentTime(void) {
   struct timeval tv;
@@ -313,7 +314,7 @@ ENTRYPOINT void reshape_flurry(ModeInfo *mi, int width, int height)
 {
     global_info_t *global = flurry_info + MI_SCREEN(mi);
 
-    glXMakeCurrent(MI_DISPLAY(mi), global->window, *(global->glx_context));
+    glXMakeCurrent(MI_DISPLAY(mi), global->window, *global->glx_context);
 
     glViewport(0.0, 0.0, width, height);
     glMatrixMode(GL_PROJECTION);
@@ -506,11 +507,11 @@ draw_flurry(ModeInfo * mi)
 	return;
 
     if (global->first) {
-	MakeTexture();
+	global->texid = MakeTexture();
 	global->first = 0;
     }
     glDrawBuffer(GL_BACK);
-    glXMakeCurrent(display, window, *(global->glx_context));
+    glXMakeCurrent(display, window, *global->glx_context);
 
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -535,13 +536,12 @@ free_flurry(ModeInfo * mi)
     global_info_t *global = &flurry_info[MI_SCREEN(mi)];
     flurry_info_t *flurry;
 
-    if (global->glx_context) {
-	glXMakeCurrent(MI_DISPLAY(mi), global->window, *(global->glx_context));
-    }
+	if (!global->glx_context) return;
+    glXMakeCurrent(MI_DISPLAY(mi), global->window, *global->glx_context);
 
-    for (flurry = global->flurry; flurry; flurry=flurry->next) {
-	delete_flurry_info(flurry);
-    }
+    for (flurry = global->flurry; flurry; flurry=flurry->next)
+		delete_flurry_info(flurry);
+	if (global->texid) glDeleteTextures (1, &global->texid);
 }
 
 XSCREENSAVER_MODULE ("Flurry", flurry)
-- 
cgit v1.2.3-55-g7522