From 625d2ca3fbf3adaa005e2ef08aba020dfa96a2a0 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Tue, 11 Nov 2008 21:02:28 +0000
Subject: [PATCH] Second attempt to fix bug #868: during login heidi crashes

---
 source/childwin.pas | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/childwin.pas b/source/childwin.pas
index 859584b8..ad2786c9 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -2333,13 +2333,9 @@ begin
     avg_perhour := '';
     avg_persec := '';
 
-    // Format numeric or byte values
+    // Detect value type
     valIsNumber := IntToStr(MakeInt(val)) = val;
     valIsBytes := valIsNumber and (Copy(ds.Fields[0].AsWideString, 1, 6) = 'Bytes_');
-    if valIsBytes then
-      val := FormatByteNumber(val)
-    else if valIsNumber then
-      val := FormatNumber(val);
 
     // Calculate average values ...
     if valIsNumber then begin
@@ -2354,6 +2350,12 @@ begin
       else avg_persec := FormatNumber( tmpval, 1 );
     end;
 
+    // Format numeric or byte values
+    if valIsBytes then
+      val := FormatByteNumber(val)
+    else if valIsNumber then
+      val := FormatNumber(val);
+
     VTRowDataListStatus[i-1].Captions.Add( val );
     VTRowDataListStatus[i-1].Captions.Add(avg_perhour);
     VTRowDataListStatus[i-1].Captions.Add(avg_persec);