diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2014-08-20 02:11:13 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2014-08-20 02:11:13 +0100 |
| commit | c8acc2c1666015daeb3038c838e5018c0ecd8903 (patch) | |
| tree | 5ad2edaf0e5fb6be146491226dca4d915333d80d /docview/src/HelpTopic.pas | |
| parent | c45010b6370b50f8e6192ddb7dc3d7762c8c29f7 (diff) | |
| parent | d0d8573b046e5020d05c86a970d303084de19b7d (diff) | |
| download | fpGUI-c8acc2c1666015daeb3038c838e5018c0ecd8903.tar.xz | |
Merge branch 'release-1.2' into master
Diffstat (limited to 'docview/src/HelpTopic.pas')
| -rw-r--r-- | docview/src/HelpTopic.pas | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docview/src/HelpTopic.pas b/docview/src/HelpTopic.pas index a9b981f1..8b12b569 100644 --- a/docview/src/HelpTopic.pas +++ b/docview/src/HelpTopic.pas @@ -235,6 +235,8 @@ uses ,nvUtilities ,ACLStringUtility ,SettingsUnit + ,fpg_stringutils + ,HelpFile ; const @@ -2544,7 +2546,10 @@ begin // normal lookup if GlobalDictIndex < _GlobalDictionary.Count then - StringToAdd := _GlobalDictionary[ GlobalDictIndex ] + begin + StringToAdd := _GlobalDictionary[ GlobalDictIndex ]; + StringToAdd := ConvertTextToUTF8(THelpFile(HelpFile).Encoding, StringToAdd); + end else StringToAdd := ''; |