From b4ac9bc07d8a9b00dd5157384b9e5456fb3fdb4f Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 20 Oct 2021 06:39:44 +0000
Subject: [PATCH] RxFPC:fix sort dialog on RxDBGrid - tnx user ZeosFirebird

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8118 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rxdb/rxdbgrid.pas | 7 +++++++
 components/rx/trunk/rxnew.lpk         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 72012e9c0..3fc177013 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -6488,6 +6488,13 @@ begin
       rxSortByForm.CheckBox1.Checked := rdgCaseInsensitiveSort in FOptionsRx;
       if rxSortByForm.Execute(Self, FSortListField) then
       begin
+        for i:=0 to Columns.Count-1 do
+        begin
+          FColumn:=Columns[i];
+          FColumn.FSortPosition:=0;
+          FColumn.FSortOrder:=smNone;
+        end;
+
         for i := 0 to FSortListField.Count - 1 do
         begin
           S1:=FSortListField.Strings[i];
diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk
index 0048c2195..fc071a5f2 100644
--- a/components/rx/trunk/rxnew.lpk
+++ b/components/rx/trunk/rxnew.lpk
@@ -25,7 +25,7 @@
 Copyright (c) 1998 Master-Bank
 translate to Lazarus by alexs in 2005 - 2020"/>
     <License Value="LGPL"/>
-    <Version Major="3" Minor="3" Release="5" Build="231"/>
+    <Version Major="3" Minor="3" Release="6" Build="232"/>
     <Files Count="70">
       <Item1>
         <Filename Value="registerrx.pas"/>