summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graemeg@gmail.com>2014-06-17 23:44:10 +0100
committerGraeme Geldenhuys <graemeg@gmail.com>2014-06-20 14:15:36 +0100
commitb355db06bd7f8ba79f9ba96032cf31e9d875470a (patch)
treedc6e0a86b104b78c70434cdbd510a5eb9e9be246 /src
parent93798138ea89b9149e2cb8c80bfc9b01ecdfec6b (diff)
downloadfpGUI-b355db06bd7f8ba79f9ba96032cf31e9d875470a.tar.xz
Revert "File Search Result Name was never correctly converted from OS encoding to UTF-8"
This reverts commit 85682e5586a60487d8aa65564dc0a77c24f080d4. The reason is because the fpgFindFirst and fpgFindNext functions already fix the sr.Name encoding. So doing it in the base filelist class corrupts the text because the encoding is applied twice. Amazing nobody picked this up for so long.
Diffstat (limited to 'src')
-rw-r--r--src/corelib/fpg_base.pas2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/fpg_base.pas b/src/corelib/fpg_base.pas
index 18333335..ea108b61 100644
--- a/src/corelib/fpg_base.pas
+++ b/src/corelib/fpg_base.pas
@@ -2731,7 +2731,7 @@ var
e: TFileEntry;
begin
e := TFileEntry.Create;
- e.Name := fpgFromOSEncoding(sr.Name);
+ e.Name := sr.Name;
e.Extension := fpgExtractFileExt(e.Name);
e.Size := sr.Size;
// e.Attributes := sr.Attr; // this is incorrect and needs to improve!