Merge pull request #1355 from keymanapp/developer-loading-utf16-kmn-fails

[Windows] Fix for failing load of UTF-16 format .kmn file (regression from default UTF-8)
This commit is contained in:
Marc Durdin 2018-11-29 05:24:18 +11:00 committed by GitHub
commit 4eb668d75c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1982,7 +1982,7 @@ begin
LoadFromFile(FileName, TEncoding.UTF8); // Let prolog determine encoding // I3337
except
on E:EEncodingError do
LoadFromFile(FileName, TEncoding.Default);
LoadFromFile(FileName);
end;
FLastFileCharSet := Encoding;// LastFileCharSet;
end