From 24493f68aa88d7fd15b4750e9142ed2a35f74b6d Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Thu, 10 Oct 2013 19:22:34 +0000
Subject: [PATCH] Revert a part of r4529, as that broke using the right font
 name+size in preferences dialog (SQL tab). Fixes issue #3378.

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

diff --git a/source/main.pas b/source/main.pas
index a503268d..e70e56f3 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -950,6 +950,7 @@ type
     FDBObjectsMaxSize: Int64;
     FDBObjectsMaxRows: Int64;
     FSearchReplaceDialog: TfrmSearchReplace;
+    FPreferencesDialog: Toptionsform;
     FGridEditFunctionMode: Boolean;
     FClipboardHasNull: Boolean;
     FTimeZoneOffset: Integer;
@@ -1955,12 +1956,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;
   // Gets freed in Dialog.FormClose
 end;
 
@@ -10277,6 +10276,8 @@ begin
   Editors.Add(SynMemoSQLLog);
   if Assigned(ActiveObjectEditor) then
     FindEditors(ActiveObjectEditor);
+  if FPreferencesDialog <> nil then
+    Editors.Add(FPreferencesDialog.SynMemoSQLSample);
 
   if AppSettings.ReadBool(asTabsToSpaces) then
     BaseEditor.Options := BaseEditor.Options + [eoTabsToSpaces]