From a027d51276870ff3f7a67803c69be41c68a71428 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Fri, 12 Oct 2007 18:51:07 +0000
Subject: [PATCH] Fix logic in TFieldEditForm.OkClick which lead to closing the
 fieldeditor with ModalResult=mrCancel after SQL errors, although
 AddUpdateField() sets mrNone.

---
 source/fieldeditor.pas | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/source/fieldeditor.pas b/source/fieldeditor.pas
index 1385c7dc..4582f9b8 100644
--- a/source/fieldeditor.pas
+++ b/source/fieldeditor.pas
@@ -542,15 +542,9 @@ procedure TFieldEditForm.OKClick(Sender: TObject);
 begin
   // add/update what?
   if fMode in [femFieldUpdate, femFieldAdd] then
-    begin
-      AddUpdateField(self);
-    end;
-  if fMode in [femIndexEditor] then
-    begin
-      UpdateKeys(self);
-    end
-  else
-    ModalResult := mrCancel;
+    AddUpdateField(self)
+  else if fMode in [femIndexEditor] then
+    UpdateKeys(self);
 end;