From d7dd1886dce08b7bf26c9fce99f23784e64a3639 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Sat, 8 Oct 2011 16:41:06 +0000
Subject: [PATCH] Include sample editor on preferences dialog in
 SetupSynEditors, so settings get applied when preferences dialog opens. Fixes
 issue #2568

---
 source/main.pas | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index 214be7c1..4d3887f7 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -853,6 +853,7 @@ type
     FDBObjectsMaxSize: Int64;
     FDBObjectsMaxRows: Int64;
     FSearchReplaceDialog: TfrmSearchReplace;
+    FPreferencesDialog: Toptionsform;
 
     // Host subtabs backend structures
     FHostListResults: TDBQueryList;
@@ -1898,12 +1899,10 @@ begin
 end;
 
 procedure TMainForm.actPreferencesExecute(Sender: TObject);
-var
-  Dialog: Toptionsform;
 begin
   // Preferences
-  Dialog := Toptionsform.Create(Self);
-  Dialog.ShowModal;
+  FPreferencesDialog := Toptionsform.Create(Self);
+  FPreferencesDialog.ShowModal;
 end;
 
 procedure TMainForm.actReadmeExecute(Sender: TObject);
@@ -9212,6 +9211,8 @@ begin
   Editors.Add(SynMemoSQLLog);
   if Assigned(ActiveObjectEditor) then
     FindEditors(ActiveObjectEditor);
+  if Assigned(FPreferencesDialog) then
+    Editors.Add(FPreferencesDialog.SynMemoSQLSample);
 
   FontName := GetRegValue(REGNAME_FONTNAME, DEFAULT_FONTNAME);
   FontSize := GetRegValue(REGNAME_FONTSIZE, DEFAULT_FONTSIZE);