From 2fa2d12d4d408af08ea9529b9af395bcf0e4833f Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 11 Jun 2025 15:54:53 +0200
Subject: [PATCH] Issue #2187: Fixed EAccessViolation when closing editor while
 using non-default theme

---
 source/texteditor.pas | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/texteditor.pas b/source/texteditor.pas
index d75bdb3b..a29e7b39 100644
--- a/source/texteditor.pas
+++ b/source/texteditor.pas
@@ -289,6 +289,9 @@ begin
     AppSettings.SessionPath := MainForm.GetRegKeyTable;
     AppSettings.WriteString(asMemoEditorHighlighter, comboHighlighter.Text, FTableColumn.Name);
   end;
+  // Fixes EAccessViolation under 64-bit when using non-default themes
+  if Assigned(Panel1) then
+    Panel1.Parent := nil;
 end;