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/tangram.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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

diff --git a/hacks/glx/tangram.c b/hacks/glx/tangram.c
index c250f54..c90d611 100644
--- a/hacks/glx/tangram.c
+++ b/hacks/glx/tangram.c
@@ -22,7 +22,6 @@
 	"*titleFont2: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*\n" \
 	"*titleFont3: -*-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*\n"  \
 
-# define free_tangram 0
 # define release_tangram 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -967,7 +966,7 @@ ENTRYPOINT void draw_tangram(ModeInfo * mi)
 
     if (! tp->glx_context)
       return;
-    glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(tp->glx_context));
+    glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *tp->glx_context);
 
     ls[small_triangle1] = &tp->tsm1;
     ls[small_triangle2] = &tp->tsm2;
@@ -1060,7 +1059,16 @@ tangram_handle_event (ModeInfo *mi, XEvent *event)
   return False;
 }
 
-
+ENTRYPOINT void
+free_tangram (ModeInfo *mi)
+{
+  tangram_configuration *tp = &tps[MI_SCREEN(mi)];
+  if (!tp->glx_context) return;
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *tp->glx_context);
+  if (tp->font1_data) free_texture_font (tp->font1_data);
+  if (tp->font2_data) free_texture_font (tp->font2_data);
+  if (tp->font3_data) free_texture_font (tp->font3_data);
+}
 
 XSCREENSAVER_MODULE ("Tangram", tangram)
 
-- 
cgit v1.2.3-55-g7522