diff --git a/source/apphelpers.pas b/source/apphelpers.pas index 7e087c32..03de9358 100644 --- a/source/apphelpers.pas +++ b/source/apphelpers.pas @@ -378,6 +378,7 @@ var ConfirmIcon: TIcon; NumberChars: TSysCharSet; LibHandleUser32: THandle; + UTF8NoBOMEncoding: TUTF8NoBOMEncoding; implementation @@ -1112,13 +1113,10 @@ end; procedure SaveUnicodeFile(Filename: String; Text: String); var Writer: TStreamWriter; - Enc: TEncoding; begin - Enc := TUTF8NoBOMEncoding.Create; - Writer := TStreamWriter.Create(Filename, False, Enc); + Writer := TStreamWriter.Create(Filename, False, UTF8NoBOMEncoding); Writer.Write(Text); Writer.Free; - Enc.Free; end; @@ -4305,6 +4303,7 @@ NumberChars := ['0'..'9', FormatSettings.DecimalSeparator, FormatSettings.Thousa LibHandleUser32 := LoadLibrary('User32.dll'); +UTF8NoBOMEncoding := TUTF8NoBOMEncoding.Create; end. diff --git a/source/main.pas b/source/main.pas index aa0cfbd2..d18aeb9d 100644 --- a/source/main.pas +++ b/source/main.pas @@ -2297,7 +2297,7 @@ begin if FileExists(BackupFilename) then begin Tab := GetOrCreateEmptyQueryTab; Tab.Uid := Section; - Tab.LoadContents(BackupFilename, True, TEncoding.UTF8); + Tab.LoadContents(BackupFilename, True, UTF8NoBOMEncoding); Tab.MemoFilename := Filename; Tab.Memo.Modified := True; if EditorHeight > 50 then