소스 검색

Bug fix: Failure when submitting Advanced Site Settings dialog

Source commit: d2bcba3b7e9a8ede3a453b55b17027c9bc26275f
Martin Prikryl 4 년 전
부모
커밋
eab7cb3733
1개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 3
      source/windows/Tools.cpp

+ 2 - 3
source/windows/Tools.cpp

@@ -1292,6 +1292,7 @@ static void __fastcall ConvertKey(UnicodeString & FileName, TKeyType Type)
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message, TStrings *& MoreMessages, UnicodeString & HelpKeyword)
 void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message, TStrings *& MoreMessages, UnicodeString & HelpKeyword)
 {
 {
+  std::unique_ptr<TStrings> AMoreMessages;
   if (!FileName.Trim().IsEmpty())
   if (!FileName.Trim().IsEmpty())
   {
   {
     FileName = ExpandEnvironmentVariables(FileName);
     FileName = ExpandEnvironmentVariables(FileName);
@@ -1300,7 +1301,6 @@ void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message
     int Error = errno;
     int Error = errno;
     HelpKeyword = HELP_LOGIN_KEY_TYPE;
     HelpKeyword = HELP_LOGIN_KEY_TYPE;
     UnicodeString PuttygenPath;
     UnicodeString PuttygenPath;
-    std::unique_ptr<TStrings> AMoreMessages;
     switch (Type)
     switch (Type)
     {
     {
       case ktOpenSSHPEM:
       case ktOpenSSHPEM:
@@ -1361,9 +1361,8 @@ void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message
         Message = MainInstructions(FMTLOAD(KEY_TYPE_UNKNOWN2, (FileName)));
         Message = MainInstructions(FMTLOAD(KEY_TYPE_UNKNOWN2, (FileName)));
         break;
         break;
     }
     }
-
-    MoreMessages = AMoreMessages.release();
   }
   }
+  MoreMessages = AMoreMessages.release();
 }
 }
 
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------