From b8f0b91210189d0f6f6f53dbd86ed0023d4d8eee Mon Sep 17 00:00:00 2001
From: jesus <jesus@lazarus-ide.org>
Date: Sun, 21 Sep 2014 22:53:57 +0000
Subject: [PATCH] LCL, dbedit, ESC key should have effect only when control is
 being edited, from Erwin van den Bosch, isse 25472

git-svn-id: trunk@46281 -
---
 lcl/include/dbedit.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lcl/include/dbedit.inc b/lcl/include/dbedit.inc
index 7c288584a1..99f020e5c3 100644
--- a/lcl/include/dbedit.inc
+++ b/lcl/include/dbedit.inc
@@ -113,9 +113,12 @@ begin
   case key of
     VK_ESCAPE:
       begin
-       //cancel out of editing by reset on esc
-       FDataLink.Reset;
-       SelectAll;
+        //cancel out of editing by reset on esc, but only when in editing mode
+        if FDataLink.Editing then begin
+          FDataLink.Reset;
+          SelectAll;
+          Key := VK_UNKNOWN;
+        end;
       end;
     VK_DELETE, VK_BACK:
       begin