From 1644bea3b3a1573009ea6332cb2b0e8ebccf264d Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sun, 24 Sep 2017 12:25:26 +0000
Subject: [PATCH] LCL: Fix a regression in TDBLookupComboBox caused by r55894
 #14e5f42ff3. Issue #32463, patch from Michal Gawrycki.

git-svn-id: trunk@55912 -
---
 lcl/dbctrls.pp                   |  1 +
 lcl/include/customdbcombobox.inc | 12 +++---------
 lcl/include/dbcombobox.inc       | 12 ++++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp
index 794c850c41..30bd98f1cb 100644
--- a/lcl/dbctrls.pp
+++ b/lcl/dbctrls.pp
@@ -707,6 +707,7 @@ Type
 
   TDBComboBox = class(TCustomDBComboBox)
   protected
+    procedure Change; override;
     procedure DataChange(Sender: TObject); override;
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
     procedure KeyPress(var Key: char); override;
diff --git a/lcl/include/customdbcombobox.inc b/lcl/include/customdbcombobox.inc
index 88d79bfc0c..2736328197 100644
--- a/lcl/include/customdbcombobox.inc
+++ b/lcl/include/customdbcombobox.inc
@@ -34,15 +34,9 @@ end;
 
 procedure TCustomDBComboBox.Change;
 begin
-  FDataLink.Modified;
-  try
-    if FDataLink.CanModify then begin
-      FDataLink.Field.AsString := Text;
-      FDatalink.Modified;
-    end;
-  finally
-    inherited Change;
-  end;
+  if FDataLink.CanModify then
+    FDataLink.Modified;
+  inherited Change;
 end;
 
 function TCustomDBComboBox.GetReadOnly: Boolean;
diff --git a/lcl/include/dbcombobox.inc b/lcl/include/dbcombobox.inc
index 6a39b9c8a1..99a359c278 100644
--- a/lcl/include/dbcombobox.inc
+++ b/lcl/include/dbcombobox.inc
@@ -17,6 +17,18 @@ begin
   FDataLink.Field.Text := Text;
 end;
 
+procedure TDBComboBox.Change;
+begin
+  try
+    if FDataLink.CanModify then begin
+      FDataLink.Field.AsString := Text;
+      FDatalink.Modified;
+    end;
+  finally
+    inherited Change;
+  end;
+end;
+
 procedure TDBComboBox.DataChange(Sender: TObject);
 var
   DataLinkField: TField;