From f1bd08accee956e900e7c7f25e7273e7ce22d077 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Thu, 19 Jun 2014 17:34:25 +0000
Subject: [PATCH] * Add enable/disablecontrols for target dataset (patch from
 Luiz Americo, bug ID #26364)

git-svn-id: trunk@28004 -
---
 packages/fcl-db/src/memds/memds.pp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/fcl-db/src/memds/memds.pp b/packages/fcl-db/src/memds/memds.pp
index 70507004c8..ba7501b6d9 100644
--- a/packages/fcl-db/src/memds/memds.pp
+++ b/packages/fcl-db/src/memds/memds.pp
@@ -990,9 +990,8 @@ begin
     end;
   CreateTable;
   If CopyData then
-    begin
+  begin
     Open;
-    OriginalPosition:=Dataset.GetBookmark;
     L1:=TList.Create;
     Try
       L2:=TList.Create;
@@ -1005,7 +1004,9 @@ begin
           L1.Add(F1);
           L2.Add(F2);
           end;
+        DisableControls;
         Dataset.DisableControls;
+        OriginalPosition:=Dataset.GetBookmark;
         Try
           Dataset.Open;
           Dataset.First; //make sure we copy from the beginning
@@ -1039,7 +1040,9 @@ begin
             Dataset.Next;
             end;
         Finally
+          DataSet.GotoBookmark(OriginalPosition); //Return to original record
           Dataset.EnableControls;
+          EnableControls;
         end;
       finally
         L2.Free;
@@ -1047,8 +1050,7 @@ begin
     finally
       l1.Free;
     end;
-    DataSet.GotoBookmark(OriginalPosition); //Return to original record
-    end;
+  end;
 end;
 
 function TMemDataset.GetRecordBufferPointer(p:TRecordBuffer; Pos:Integer):TRecordBuffer;