From 0f74c7a977c412a81890926548e2a5c8dae5f6eb Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sat, 6 Feb 2021 13:34:00 +0100
Subject: [PATCH] Fix double free caused by CGUITTFont code

This partially reverts commit 2072afb72b4b3e9c5dcbcec71d824aeae1b35d19.
fixes #10920
---
 src/irrlicht_changes/CGUITTFont.cpp | 4 ----
 src/irrlicht_changes/CGUITTFont.h   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp
index 0f3368822..bd4e700de 100644
--- a/src/irrlicht_changes/CGUITTFont.cpp
+++ b/src/irrlicht_changes/CGUITTFont.cpp
@@ -378,7 +378,6 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
 	}
 
 	// Store our face.
-	sguitt_face = face;
 	tt_face = face->face;
 
 	// Store font metrics.
@@ -437,9 +436,6 @@ CGUITTFont::~CGUITTFont()
 	// Drop our driver now.
 	if (Driver)
 		Driver->drop();
-
-	// Destroy sguitt_face after clearing c_faces
-	delete sguitt_face;
 }
 
 void CGUITTFont::reset_images()
diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h
index b64e57a45..310f74f67 100644
--- a/src/irrlicht_changes/CGUITTFont.h
+++ b/src/irrlicht_changes/CGUITTFont.h
@@ -375,7 +375,6 @@ namespace gui
 			gui::IGUIEnvironment* Environment;
 			video::IVideoDriver* Driver;
 			io::path filename;
-			SGUITTFace* sguitt_face = nullptr;
 			FT_Face tt_face;
 			FT_Size_Metrics font_metrics;
 			FT_Int32 load_flags;