浏览代码

Bug 1629: Failure when binary file is attempted to be opened in an internal editor on system with multibyte legacy encoding

https://winscp.net/tracker/1629
(cherry picked from commit acba183ed9059c91233b20741e7e5042f206d220)

Source commit: 7cdfa7d7d023ea0a4a1d4d3ece593f2ffefe02cc
Martin Prikryl 7 年之前
父节点
当前提交
71010e6b97
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      source/forms/Editor.cpp

+ 1 - 1
source/forms/Editor.cpp

@@ -1301,7 +1301,7 @@ void __fastcall TEditorForm::LoadFromFile(bool PrimaryEncoding)
       {
         UnicodeString Message = FMTLOAD(EDITOR_ENCODING_ERROR, (FFileName, FEncodingName));
 
-        if (CanTrySecondary)
+        if (PrimaryEncoding && CanTrySecondary)
         {
           TEncoding * EncodingBackup = FEncoding;
           UnicodeString EncodingNameBackup = FEncodingName;