Fixed #955 Incorrect record no for load all pages type

rappen · Aug 20, 2023 · ad9b64b · ad9b64b
1 parent 04abf5e
commit ad9b64b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -57,7 +57,7 @@ internal void SetData(QueryInfo queryinfo)
             }
             if (queryinfo.RecordFrom > -1 && queryinfo.RecordTo > -1)
             {
-                if (queryinfo.RecordFrom > 1 || queryinfo.Results.MoreRecords)
+                if (!form.settings.Results.RetrieveAllPages && (queryinfo.RecordFrom > 1 || queryinfo.Results.MoreRecords))
                 {
                     mnuRecordsNumbers.Text = $"Records: {queryinfo.RecordFrom}-{queryinfo.RecordTo}";
                     if (queryinfo.Results.TotalRecordCount > 0 && queryinfo.Results.TotalRecordCount < 5000)
@@ -67,7 +67,7 @@ internal void SetData(QueryInfo queryinfo)
                 }
                 else
                 {
-                    mnuRecordsNumbers.Text = $"Records: {queryinfo.RecordTo}";
+                    mnuRecordsNumbers.Text = $"Records: {queryinfo.Results.Entities.Count}";
                 }
                 mnuRecordsNumbers.Visible = true;
             }